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

[Mark D. Baushke]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Mark D. Baushke <mdb>   08/11/05 18:17:37

Modified files:
        src            : ChangeLog sanity.sh 

Log message:
        * sanity.sh (keyword-25): Fix merge from cvs 1.11.x problem.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3630&r2=1.3631
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1215&r2=1.1216

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3630
retrieving revision 1.3631
diff -u -b -r1.3630 -r1.3631
--- ChangeLog   5 Nov 2008 15:17:12 -0000       1.3630
+++ ChangeLog   5 Nov 2008 18:17:36 -0000       1.3631
@@ -1,5 +1,7 @@
 2008-11-05  Mark D. Baushke  <address@hidden>
 
+       * sanity.sh (keyword-25): Fix merge from cvs 1.11.x problem.
+
        *diff.c (diff): Use SEND_FORCE on files when a -k option is used
        with diff to avoid client/server not finding the requested file.
        * sanity.sh (keyword): Add tests for this.

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1215
retrieving revision 1.1216
diff -u -b -r1.1215 -r1.1216
--- sanity.sh   5 Nov 2008 15:17:14 -0000       1.1215
+++ sanity.sh   5 Nov 2008 18:17:37 -0000       1.1216
@@ -26541,11 +26541,7 @@
 change"
 
          dotest_fail keyword-25 "${testcvs} diff -kk file1" \
-"Index: file1
-===================================================================
-RCS file: ${CVSROOT_DIRNAME}/first-dir/file1,v
-retrieving revision 1\.3
-diff -r1\.3 file1
+"diff -r1\.3 file1
 1c1
 < \$Name\$
 ---