summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorfenner <fenner@FreeBSD.org>2002-07-08 10:05:26 +0000
committerfenner <fenner@FreeBSD.org>2002-07-08 10:05:26 +0000
commitaeccf286e8794035a7a158ef6cd04d0163353f83 (patch)
tree5ffa5e7a479f11313cd6b73d312d2b2de7cdbaa0 /contrib
parent9b9f850aa320caac25d1ee6fefab40108b8398e0 (diff)
downloadFreeBSD-src-aeccf286e8794035a7a158ef6cd04d0163353f83.zip
FreeBSD-src-aeccf286e8794035a7a158ef6cd04d0163353f83.tar.gz
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
Diffstat (limited to 'contrib')
-rw-r--r--contrib/cvs/src/client.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/cvs/src/client.c b/contrib/cvs/src/client.c
index 77ab4c8..1e332bc 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"))
OpenPOWER on IntegriCloud