[Cvs-cvs] ccvs/src ChangeLog 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>     07/06/15 21:11:18

Modified files:
        src            : ChangeLog sanity.sh 

Log message:
        (import-2): Test files named "CVS", in addition to directories.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.2336.2.484&r2=1.2336.2.485
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.752.2.210&r2=1.752.2.211

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.2336.2.484
retrieving revision 1.2336.2.485
diff -u -b -r1.2336.2.484 -r1.2336.2.485
--- ChangeLog   15 Jun 2007 20:56:40 -0000      1.2336.2.484
+++ ChangeLog   15 Jun 2007 21:11:10 -0000      1.2336.2.485
@@ -2,7 +2,8 @@
 
        * import.c (import): Check more carefully for files and directories
        named "CVS".
-       * sanity.sh (import-1b): Test for same.
+       * sanity.sh (import-1b): New test for same.
+       (import-2): Test files named "CVS", in addition to directories.
 
 2007-05-22  Larry Jones  <address@hidden>
 

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.752.2.210
retrieving revision 1.752.2.211
diff -u -b -r1.752.2.210 -r1.752.2.211
--- sanity.sh   15 Jun 2007 20:55:03 -0000      1.752.2.210
+++ sanity.sh   15 Jun 2007 21:11:13 -0000      1.752.2.211
@@ -8666,7 +8666,7 @@
 $PROG \[import aborted\]: as a directory in a path or as a file name\."
          mkdir sdir
          mkdir sdir/CVS
-         touch sdir/CVS/file4 sdir/CVS/file5 sdir/file6 sdir/file7
+         touch CVS sdir/CVS/file4 sdir/CVS/file5 sdir/file6 sdir/file7
          # Calling the imported directory import-CVS is dual purpose in the
          # following test.  It makes sure the path test which matched above
          # wasn't too strict.
@@ -8674,6 +8674,7 @@
 "$testcvs import -I! -mimport import-CVS vtag rtag" \
 "
 
+I import-CVS/CVS
 I import-CVS/sdir/CVS
 N import-CVS/file1
 N import-CVS/file2