From 0ef587351ee77ba40172b6821599d38cebb31fb4 Mon Sep 17 00:00:00 2001 From: Bill Fenner Date: Mon, 8 Jul 2002 10:05:26 +0000 Subject: [PATCH] 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 --- contrib/cvs/src/client.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/cvs/src/client.c b/contrib/cvs/src/client.c index 77ab4c83413d..1e332bc6929f 100644 --- a/contrib/cvs/src/client.c +++ b/contrib/cvs/src/client.c @@ -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"))