[Top][All Lists]
[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 01:15:35 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Changes by: Derek Robert Price <dprice> 06/06/09 01:15:34
Modified files:
src : ChangeLog sanity.sh
Log message:
* sanity.sh (writeproxy, writeproxy-noredirect): Compensate for the new
Empty-conflicts request.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3441&r2=1.3442
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1149&r2=1.1150
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3441
retrieving revision 1.3442
diff -u -b -r1.3441 -r1.3442
--- ChangeLog 8 Jun 2006 21:06:53 -0000 1.3441
+++ ChangeLog 9 Jun 2006 01:15:34 -0000 1.3442
@@ -11,6 +11,8 @@
* 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.
+ * sanity.sh (writeproxy, writeproxy-noredirect): Compensate for the new
+ Empty-conflicts request.
* sanity.sh (conflicts4): New tests.
(Original patch from Mark D. Baushke <address@hidden>.)
Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1149
retrieving revision 1.1150
diff -u -b -r1.1149 -r1.1150
--- sanity.sh 8 Jun 2006 22:44:46 -0000 1.1149
+++ sanity.sh 9 Jun 2006 01:15:34 -0000 1.1150
@@ -32552,7 +32552,7 @@
save_CVS_SERVER=$CVS_SERVER
ln -s $PRIMARY_CVSROOT_DIRNAME $TESTDIR/primary_link
dotest writeproxy-0 "$CVS_SERVER server" \
-"Valid-requests Root Valid-responses valid-requests Command-prep Referrer
Repository Directory Relative-directory Max-dotdot Static-directory Sticky
Entry Kopt Checkin-time Modified Signature Base-diff Is-modified UseUnchanged
Unchanged Notify Hostname LocalDir Questionable Argument Argumentx
Global_option Gzip-stream wrapper-sendme-rcsOptions Set
${DOTSTAR}expand-modules ci co update diff log rlog list rlist
global-list-quiet ls add remove update-patches gzip-file-contents sign status
rdiff tag rtag import admin export history release watch-on watch-off watch-add
watch-remove watchers editors edit init annotate rannotate noop version
+"Valid-requests Root Valid-responses valid-requests Command-prep Referrer
Repository Directory Relative-directory Max-dotdot Static-directory Sticky
Entry Kopt Checkin-time Modified Signature Base-diff Is-modified
Empty-conflicts UseUnchanged Unchanged Notify Hostname LocalDir Questionable
Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set
${DOTSTAR}expand-modules ci co update diff log rlog list rlist
global-list-quiet ls add remove update-patches gzip-file-contents sign status
rdiff tag rtag import admin export history release watch-on watch-off watch-add
watch-remove watchers editors edit init annotate rannotate noop version
ok
ok
ok" \
@@ -32839,7 +32839,7 @@
mv $TESTDIR/save-root $PRIMARY_CVSROOT_DIRNAME
dotest writeproxy-noredirect-5 "$CVS_SERVER server" \
-"Valid-requests Root Valid-responses valid-requests Command-prep Referrer
Repository Directory Relative-directory Max-dotdot Static-directory Sticky
Entry Kopt Checkin-time Modified Signature Base-diff Is-modified UseUnchanged
Unchanged Notify Hostname LocalDir Questionable Argument Argumentx
Global_option Gzip-stream wrapper-sendme-rcsOptions Set
${DOTSTAR}expand-modules ci co update diff log rlog list rlist
global-list-quiet ls add remove update-patches gzip-file-contents sign status
rdiff tag rtag import admin export history release watch-on watch-off watch-add
watch-remove watchers editors edit init annotate rannotate noop version
+"Valid-requests Root Valid-responses valid-requests Command-prep Referrer
Repository Directory Relative-directory Max-dotdot Static-directory Sticky
Entry Kopt Checkin-time Modified Signature Base-diff Is-modified
Empty-conflicts UseUnchanged Unchanged Notify Hostname LocalDir Questionable
Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set
${DOTSTAR}expand-modules ci co update diff log rlog list rlist
global-list-quiet ls add remove update-patches gzip-file-contents sign status
rdiff tag rtag import admin export history release watch-on watch-off watch-add
watch-remove watchers editors edit init annotate rannotate noop version
ok
ok
ok
@@ -32871,7 +32871,7 @@
cd firstdir
echo now you see me >file1
dotest writeproxy-noredirect-6 "$CVS_SERVER server" \
-"Valid-requests Root Valid-responses valid-requests Command-prep Referrer
Repository Directory Relative-directory Max-dotdot Static-directory Sticky
Entry Kopt Checkin-time Modified Signature Base-diff Is-modified UseUnchanged
Unchanged Notify Hostname LocalDir Questionable Argument Argumentx
Global_option Gzip-stream wrapper-sendme-rcsOptions Set
${DOTSTAR}expand-modules ci co update diff log rlog list rlist
global-list-quiet ls add remove update-patches gzip-file-contents sign status
rdiff tag rtag import admin export history release watch-on watch-off watch-add
watch-remove watchers editors edit init annotate rannotate noop version
+"Valid-requests Root Valid-responses valid-requests Command-prep Referrer
Repository Directory Relative-directory Max-dotdot Static-directory Sticky
Entry Kopt Checkin-time Modified Signature Base-diff Is-modified
Empty-conflicts UseUnchanged Unchanged Notify Hostname LocalDir Questionable
Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set
${DOTSTAR}expand-modules ci co update diff log rlog list rlist
global-list-quiet ls add remove update-patches gzip-file-contents sign status
rdiff tag rtag import admin export history release watch-on watch-off watch-add
watch-remove watchers editors edit init annotate rannotate noop version
ok
ok
ok
@@ -32901,7 +32901,7 @@
echo /file1/0/dummy+timestamp// >>CVS/Entries
dotest writeproxy-noredirect-7 "$CVS_SERVER server" \
-"Valid-requests Root Valid-responses valid-requests Command-prep Referrer
Repository Directory Relative-directory Max-dotdot Static-directory Sticky
Entry Kopt Checkin-time Modified Signature Base-diff Is-modified UseUnchanged
Unchanged Notify Hostname LocalDir Questionable Argument Argumentx
Global_option Gzip-stream wrapper-sendme-rcsOptions Set
${DOTSTAR}expand-modules ci co update diff log rlog list rlist
global-list-quiet ls add remove update-patches gzip-file-contents sign status
rdiff tag rtag import admin export history release watch-on watch-off watch-add
watch-remove watchers editors edit init annotate rannotate noop version
+"Valid-requests Root Valid-responses valid-requests Command-prep Referrer
Repository Directory Relative-directory Max-dotdot Static-directory Sticky
Entry Kopt Checkin-time Modified Signature Base-diff Is-modified
Empty-conflicts UseUnchanged Unchanged Notify Hostname LocalDir Questionable
Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set
${DOTSTAR}expand-modules ci co update diff log rlog list rlist
global-list-quiet ls add remove update-patches gzip-file-contents sign status
rdiff tag rtag import admin export history release watch-on watch-off watch-add
watch-remove watchers editors edit init annotate rannotate noop version
ok
ok
Mode u=rw,g=rw,o=r