[Cvs-cvs] ccvs/src ChangeLog update.c

[Larry Jones]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Larry Jones <scjones>   08/11/18 19:18:17

Modified files:
        src            : ChangeLog update.c 

Log message:
        Merge changes from cvs1-11-x-branch

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3634&r2=1.3635
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/update.c?cvsroot=cvs&r1=1.287&r2=1.288

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3634
retrieving revision 1.3635
diff -u -b -r1.3634 -r1.3635
--- ChangeLog   18 Nov 2008 18:38:45 -0000      1.3634
+++ ChangeLog   18 Nov 2008 19:18:16 -0000      1.3635
@@ -1,5 +1,9 @@
 2008-11-18  Larry Jones  <address@hidden>
 
+       commit.c, update.c: Fix gcc -Wall warnings.
+
+2008-11-18  Larry Jones  <address@hidden>
+
        * sanity.sh: Fix nonportable ``date +%s'' test.
 
 2008-11-17  Larry Jones  <address@hidden>

Index: update.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/update.c,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -b -r1.287 -r1.288
--- update.c    5 Nov 2008 15:17:15 -0000       1.287
+++ update.c    18 Nov 2008 19:18:16 -0000      1.288
@@ -2196,7 +2196,7 @@
            || /* destination branch modified in repository */
               !STREQ (rev1, vers->vn_user)
            || /* locally modified */
-              vers->ts_user && !STREQ (vers->ts_user, vers->ts_rcs))
+              (vers->ts_user && !STREQ (vers->ts_user, vers->ts_rcs)))
        {
            /* The removal should happen if either the file has never changed
             * on the destination or the file has changed to be identical to