cvs-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Derek Robert Price
Subject: [Cvs-cvs] ccvs/src ChangeLog sanity.sh
Date: Fri, 09 Jun 2006 02:11:24 +0000

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     06/06/09 02:11:24

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.3442&r2=1.3443
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1150&r2=1.1151

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3442
retrieving revision 1.3443
diff -u -b -r1.3442 -r1.3443
--- ChangeLog   9 Jun 2006 01:15:34 -0000       1.3442
+++ ChangeLog   9 Jun 2006 02:11:24 -0000       1.3443
@@ -1,5 +1,7 @@
 2006-06-08  Derek Price  <address@hidden>
 
+       * sanity.sh (conflicts4): Test that the client honors Empty-conflicts.
+
        * sanity.config.sh.in: Add DEFAULT_SIGN_TEMPLATE &
        DEFAULT_SIGN_TEXTMODE.
        * sanity.sh: Test verification of concatenated signatures.

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1150
retrieving revision 1.1151
diff -u -b -r1.1150 -r1.1151
--- sanity.sh   9 Jun 2006 01:15:34 -0000       1.1150
+++ sanity.sh   9 Jun 2006 02:11:24 -0000       1.1151
@@ -12346,6 +12346,7 @@
 
 
        conflicts4)
+         mkdir conflicts4; cd conflicts4
          mkdir 1; cd 1
          dotest conflicts4-1 "$testcvs -q co -l ."
          mkdir first-dir
@@ -12377,10 +12378,82 @@
          dotest_fail conflicts4-9 "$testcvs -q update" \
 "C file1"
          
+         if $remote; then
+           cat >$TESTDIR/conflicts4/serveme <<EOF
+#!$TESTSHELL
+# This is admittedly a bit cheezy, in the sense that we make lots
+# of assumptions about what the client is going to send us.
+# We don't mention Repository, because current clients don't require it.
+# Sending these at our own pace, rather than waiting for the client to
+# make the requests, is bogus, but hopefully we can get away with it.
+echo "Valid-requests Root Valid-responses valid-requests Directory Entry 
Modified Unchanged Argument Argumentx ci co update Global_option"
+echo "ok"
+echo "MT text C "
+echo "MT fname file1"
+echo "MT newline"
+echo "error  "
+cat >$TESTDIR/conflicts4/client.out
+EOF
+           # Cygwin.  Pthffffffffft!
+           if test -n "$remotehost"; then
+             $CVS_RSH $remotehost "chmod +x $TESTDIR/conflicts4/serveme"
+           else
+             chmod +x $TESTDIR/conflicts4/serveme
+           fi
+           save_CVS_SERVER=$CVS_SERVER
+           CVS_SERVER=$TESTDIR/conflicts4/serveme; export CVS_SERVER
+           dotest_fail conflicts4-10r "$testcvs -q up" "C file1"
+           dotest conflicts4-11r "cat $TESTDIR/conflicts4/client.out" \
+"$DOTSTAR
+Argument --
+Directory .
+/tmp/cvs-sanity/cvsroot/first-dir
+Entry /file1/1.2/+=//
+Modified file1
+u=rw,g=rw,o=r
+59
+baseline
+""<<<<<<< file1
+wibble1
+""=======
+wibble2
+"">>>>>>> 1.2
+update"
+
+           cat >$TESTDIR/conflicts4/serveme <<EOF
+#!$TESTSHELL
+# This is admittedly a bit cheezy, in the sense that we make lots
+# of assumptions about what the client is going to send us.
+# We don't mention Repository, because current clients don't require it.
+# Sending these at our own pace, rather than waiting for the client to
+# make the requests, is bogus, but hopefully we can get away with it.
+echo "Valid-requests Root Valid-responses valid-requests Directory Entry 
Modified Unchanged Argument Argumentx ci co update Global_option 
Empty-conflicts"
+echo "ok"
+echo "MT text C "
+echo "MT fname file1"
+echo "MT newline"
+echo "error  "
+cat >$TESTDIR/conflicts4/client.out
+EOF
+
+           dotest_fail conflicts4-12r "$testcvs -q up" "C file1"
+           dotest conflicts4-13r "cat $TESTDIR/conflicts4/client.out" \
+"$DOTSTAR
+Argument --
+Directory .
+/tmp/cvs-sanity/cvsroot/first-dir
+Entry /file1/1.2/+=//
+Unchanged file1
+update"
+
+           CVS_SERVER=$save_CVS_SERVER; export CVS_SERVER
+         fi
+
          dokeep
-         cd ../..
-         rm -rf 1 2
+         cd ../../..
+         rm -rf conflicts4
          modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
+
          ;;
 
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]