Always upload new files, even if the timestamps match. This is a workaround
for the trouble that DES and I had with MFCs: when "cvs update -jfoo -jbar" creates a new file, it sets the version to 0 ("new") but sets the timestamp in the Entries file to the timestamp of the file that's new on the branch. The CVS client doesn't upload files whose timestamps match with the Entries file, so these new files don't get uploaded to the server and the server fails when trying to check them in. PR: bin/40227 Approved by: peter MFC after: 2 weeks
This commit is contained in:
parent
a20ae49f93
commit
0ef587351e
@ -5226,7 +5226,8 @@ warning: ignoring -k options due to server limitations");
|
||||
}
|
||||
else if (vers->ts_rcs == NULL
|
||||
|| args->force
|
||||
|| strcmp (vers->ts_user, vers->ts_rcs) != 0)
|
||||
|| strcmp (vers->ts_user, vers->ts_rcs) != 0
|
||||
|| (vers->vn_user && *vers->vn_user == '0'))
|
||||
{
|
||||
if (args->no_contents
|
||||
&& supported_request ("Is-modified"))
|
||||
|
Loading…
Reference in New Issue
Block a user