[Cvs-cvs] ccvs/src ChangeLog recurse.c sanity.sh [cvs1-11-x-branch]

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         cvs1-11-x-branch
Changes by:     Derek Robert Price <dprice>     06/08/28 19:56:46

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

Log message:
        * recurse.c (do_recursion): Remove misguided assertion.
        * sanity.sh (dottedroot-3): Add test for the above.
        (Thanks to report from Paul Eggert <address@hidden>.)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.2336.2.471&r2=1.2336.2.472
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/recurse.c?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.77.4.10&r2=1.77.4.11
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.752.2.205&r2=1.752.2.206

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.2336.2.471
retrieving revision 1.2336.2.472
diff -u -b -r1.2336.2.471 -r1.2336.2.472
--- ChangeLog   28 Aug 2006 19:53:49 -0000      1.2336.2.471
+++ ChangeLog   28 Aug 2006 19:56:44 -0000      1.2336.2.472
@@ -1,5 +1,9 @@
 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

Index: recurse.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/recurse.c,v
retrieving revision 1.77.4.10
retrieving revision 1.77.4.11
diff -u -b -r1.77.4.10 -r1.77.4.11
--- recurse.c   2 Sep 2005 19:37:35 -0000       1.77.4.10
+++ recurse.c   28 Aug 2006 19:56:45 -0000      1.77.4.11
@@ -662,7 +662,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.752.2.205
retrieving revision 1.752.2.206
diff -u -b -r1.752.2.205 -r1.752.2.206
--- sanity.sh   28 Aug 2006 19:52:37 -0000      1.752.2.205
+++ sanity.sh   28 Aug 2006 19:56:45 -0000      1.752.2.206
@@ -29436,8 +29436,13 @@
 ${PROG} [a-z]*: Updating module1/dir2
 U module1/dir2/file1"
 
+         # This also triggered the assertion failure above prior to 1.11.23.
+         dotest dottedroot-3 \
+"$testcvs -q co -prINITIAL module1/./dir2/file1" \
+'version1'
+
            if $keep; then
-             echo Keeping ${TESTDIR} and exiting due to --keep
+           echo Keeping $TESTDIR and exiting due to --keep
              exit 0
            fi