[Cvs-cvs] ccvs/src 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/06/09 02:10:37

Modified files:
        src            : sanity.sh 

Log message:
        * sanity.sh (conflicts4): Test that the client honors Empty-conflicts.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.752.2.199&r2=1.752.2.200

Patches:
Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.752.2.199
retrieving revision 1.752.2.200
diff -u -b -r1.752.2.199 -r1.752.2.200
--- sanity.sh   9 Jun 2006 02:06:16 -0000       1.752.2.199
+++ sanity.sh   9 Jun 2006 02:10:36 -0000       1.752.2.200
@@ -11401,17 +11401,17 @@
 "$DOTSTAR
 Argument --
 Directory .
-/tmp/cvs-sanity/cvsroot/first-dir
+$CVSROOT_DIRNAME/first-dir
 Entry /file1/1.2/+=//
 Modified file1
 u=rw,g=rw,o=r
 59
 baseline
-<<<<<<< file1
+""<<<<<<< file1
 wibble1
-=======
+""=======
 wibble2
->>>>>>> 1.2
+"">>>>>>> 1.2
 update"
 
            cat >$TESTDIR/conflicts4/serveme <<EOF
@@ -11435,7 +11435,7 @@
 "$DOTSTAR
 Argument --
 Directory .
-/tmp/cvs-sanity/cvsroot/first-dir
+$CVSROOT_DIRNAME/first-dir
 Entry /file1/1.2/+=//
 Unchanged file1
 update"