[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

cvs 1.11.2 src/client.c bugfix

From: Mark D. Baushke
Subject: cvs 1.11.2 src/client.c bugfix
Date: Wed, 25 Sep 2002 10:01:48 -0700

Hi Folks,

The following bug report


describes a problem with new files and cvs update. The patch looks good
to me and I would like to see it put into the cvshome.org sources.

        -- Mark

FreeBSD log:
revision 1.7
date: 2002/07/08 10:05:26;  author: fenner;  state: Exp;  lines: +3 -2
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

RCS file: /cvs/ccvs/src/client.c,v
retrieving revision 1.313
diff -u -p -r1.313 client.c
--- client.c    23 Sep 2002 22:11:26 -0000      1.313
+++ client.c    24 Sep 2002 09:08:34 -0000
@@ -5236,7 +5236,8 @@ warning: ignoring -k options due to serv
     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"))

reply via email to

[Prev in Thread] Current Thread [Next in Thread]