[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/src ChangeLog sanity.sh [cvs1-11-x-branch]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] ccvs/src ChangeLog sanity.sh [cvs1-11-x-branch] |
Date: |
Fri, 09 Jun 2006 02:06:19 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch: cvs1-11-x-branch
Changes by: Derek Robert Price <dprice> 06/06/09 02:06:17
Modified files:
src : ChangeLog sanity.sh
Log message:
* sanity.sh (conflicts4): Test that the client honors Empty-conflicts.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.2336.2.457&r2=1.2336.2.458
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.752.2.198&r2=1.752.2.199
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.2336.2.457
retrieving revision 1.2336.2.458
diff -u -b -r1.2336.2.457 -r1.2336.2.458
--- ChangeLog 8 Jun 2006 19:58:29 -0000 1.2336.2.457
+++ ChangeLog 9 Jun 2006 02:06:16 -0000 1.2336.2.458
@@ -1,5 +1,7 @@
2006-06-08 Derek Price <address@hidden>
+ * sanity.sh (conflicts4): Test that the client honors Empty-conflicts.
+
* server.c (requests): Add "Empty-conflicts" marker.
* client.c (send_fileproc): Send contents of all files with conflicts
unless the server can handle the conflict marker in the Entry.
Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.752.2.198
retrieving revision 1.752.2.199
diff -u -b -r1.752.2.198 -r1.752.2.199
--- sanity.sh 8 Jun 2006 19:58:30 -0000 1.752.2.198
+++ sanity.sh 9 Jun 2006 02:06:16 -0000 1.752.2.199
@@ -11331,6 +11331,7 @@
;;
conflicts4)
+ mkdir conflicts4; cd conflicts4
mkdir 1; cd 1
dotest conflicts4-1 "$testcvs -q co -l ."
mkdir first-dir
@@ -11371,13 +11372,84 @@
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
+
if $keep; then
echo Keeping $TESTDIR and exiting due to --keep
exit 0
fi
- cd ../..
- rm -rf 1 2
+ cd ../../..
+ rm -rf conflicts4
rm -rf $CVSROOT_DIRNAME/first-dir
;;
- [Cvs-cvs] ccvs/src ChangeLog sanity.sh [cvs1-11-x-branch],
Derek Robert Price <=