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

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     07/06/15 21:19:35

Modified files:
        src            : ChangeLog 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.3515&r2=1.3516
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1180&r2=1.1181

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3515
retrieving revision 1.3516
diff -u -b -r1.3515 -r1.3516
--- ChangeLog   15 Jun 2007 21:04:58 -0000      1.3515
+++ ChangeLog   15 Jun 2007 21:19:34 -0000      1.3516
@@ -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-06-13  Mark D. Baushke  <address@hidden>
 

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1180
retrieving revision 1.1181
diff -u -b -r1.1180 -r1.1181
--- sanity.sh   15 Jun 2007 21:04:59 -0000      1.1180
+++ sanity.sh   15 Jun 2007 21:19:34 -0000      1.1181
@@ -10547,7 +10547,7 @@
 $CPROG \[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.
@@ -10555,6 +10555,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