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

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     06/08/28 20:12:06

Modified files:
        src            : ChangeLog recurse.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.3484&r2=1.3485
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/recurse.c?cvsroot=cvs&r1=1.117&r2=1.118
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1167&r2=1.1168

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3484
retrieving revision 1.3485
diff -u -b -r1.3484 -r1.3485
--- ChangeLog   28 Aug 2006 20:00:37 -0000      1.3484
+++ ChangeLog   28 Aug 2006 20:12:06 -0000      1.3485
@@ -1,3 +1,15 @@
+2006-08-28  Derek Price  <address@hidden>
+
+       * recurse.c (do_recursion): Remove misguided assertion.
+       * sanity.sh (dottedroot-3): Add test for the above.
+       (Thanks to report from Paul Eggert <address@hidden>.)
+
+       [bug #17168]
+       * classify.c (Classify_File): Use T_PATCH for changed keywords instead
+       of T_CHECKOUT to conserver bandwidth.  Don't sticky check when marking
+       files for update anyhow.
+       * sanity.sh: Update to compensate (s/^U /[UP] /).
+
 2006-08-25  Derek Price  <address@hidden>
 
        * sanity.sh (ls-d-init-11): Verify output of CVS run.

Index: recurse.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/recurse.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- recurse.c   6 Jul 2006 02:14:08 -0000       1.117
+++ recurse.c   28 Aug 2006 20:12:06 -0000      1.118
@@ -767,7 +767,6 @@
     {
        repository = frame->repository;
        assert (repository != NULL);
-       assert (strstr (repository, "/./") == NULL);
     }
 
     fileattr_startdir (repository);

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1167
retrieving revision 1.1168
diff -u -b -r1.1167 -r1.1168
--- sanity.sh   28 Aug 2006 20:00:37 -0000      1.1167
+++ sanity.sh   28 Aug 2006 20:12:06 -0000      1.1168
@@ -32511,6 +32511,12 @@
 ${SPROG} checkout: Updating module1/dir2
 U module1/dir2/file1"
 
+         # This also triggered the assertion failure above prior to 1.11.23 &
+         # 1.12.14.
+         dotest dottedroot-3 \
+"$testcvs -q co -prINITIAL module1/./dir2/file1" \
+'version1'
+
          dokeep
 
          rm -rf ${CVSROOT_DIRNAME}