[Cvs-cvs] ccvs/src ChangeLog classify.c sanity.sh

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     08/09/12 14:34:48

Modified files:
        src            : ChangeLog classify.c sanity.sh 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3572&r2=1.3573
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/classify.c?cvsroot=cvs&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1198&r2=1.1199

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3572
retrieving revision 1.3573
diff -u -b -r1.3572 -r1.3573
--- ChangeLog   10 Sep 2008 17:53:45 -0000      1.3572
+++ ChangeLog   12 Sep 2008 14:34:46 -0000      1.3573
@@ -1,3 +1,12 @@
+2008-09-12  Derek R. Price  <address@hidden>
+
+       * sanity.sh: Unset CDPATH during initialization.
+       (Report from Paul Edwards <address@hidden>.)
+
+2008-05-09  Derek R. Price  <address@hidden>
+
+       * classify.c (Classify_File): Remove obsolete TODO comment.
+
 2008-09-10  Derek R. Price  <address@hidden>
 
        * sanity.sh: More minor expectation synchronization.

Index: classify.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/classify.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- classify.c  12 Sep 2007 17:27:21 -0000      1.41
+++ classify.c  12 Sep 2008 14:34:47 -0000      1.42
@@ -350,8 +350,6 @@
                 * has changed.  If the sticky tag has changed, we just need
                 * to re-register the entry
                 */
-               /* TODO: decide whether we need to check file permissions
-                  for a mismatch, and return T_CONFLICT if so. */
                if (keywords_may_change (aflag, vers))
                    ret = T_PATCH;
                else if (vers->ts_conflict)

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1198
retrieving revision 1.1199
diff -u -b -r1.1198 -r1.1199
--- sanity.sh   10 Sep 2008 17:53:46 -0000      1.1198
+++ sanity.sh   12 Sep 2008 14:34:47 -0000      1.1199
@@ -98,6 +98,9 @@
 # required to make this script work properly.
 unset CVSREAD
 
+# Bash sometimes echoes the path when CDPATH is set.
+unset CDPATH
+
 # This will cause malloc to run slower but should also catch some common errors
 # when CVS is linked with glibc 2.x.
 MALLOC_CHECK_=2; export MALLOC_CHECK_