[Cvs-cvs] ccvs/doc ChangeLog cvsclient.texi stamp-1 versi...

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     06/06/08 20:20:48

Modified files:
        doc            : ChangeLog cvsclient.texi stamp-1 
                         version-client.texi 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/ChangeLog?cvsroot=cvs&r1=1.961&r2=1.962
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/cvsclient.texi?cvsroot=cvs&r1=1.144&r2=1.145
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/stamp-1?cvsroot=cvs&r1=1.86&r2=1.87
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/version-client.texi?cvsroot=cvs&r1=1.86&r2=1.87

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/ChangeLog,v
retrieving revision 1.961
retrieving revision 1.962
diff -u -b -r1.961 -r1.962
--- ChangeLog   20 May 2006 12:43:51 -0000      1.961
+++ ChangeLog   8 Jun 2006 20:20:48 -0000       1.962
@@ -1,3 +1,7 @@
+2006-06-08  Derek Price  <address@hidden>
+
+       * cvsclient.texi (Requests): Add Empty-conflicts.
+
 2006-05-20  Derek Price  <address@hidden>
 
        * cvs.texinfo (CVS commands): Correct tag & rtag description.

Index: cvsclient.texi
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/cvsclient.texi,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -b -r1.144 -r1.145
--- cvsclient.texi      24 Apr 2006 18:50:25 -0000      1.144
+++ cvsclient.texi      8 Jun 2006 20:20:48 -0000       1.145
@@ -907,6 +907,12 @@
 not do anything) and clients must issue it.
 The @code{Root} request need not have been previously sent.
 
address@hidden Empty-conflicts \n
+Response expected: no.  This is a placeholder response intended to alert the
+client that the server does not require the contents of unmodified files with
+conflicts for operations other than diff.  It was a bug in pre 1.11.22 &
+pre 1.12.14 servers that this was required to notice conflicts.
+
 @item Notify @var{filename} \n
 Response expected: no.
 Tell the server that an @code{edit} or @code{unedit} command has taken

Index: stamp-1
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/stamp-1,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- stamp-1     9 May 2006 01:55:03 -0000       1.86
+++ stamp-1     8 Jun 2006 20:20:48 -0000       1.87
@@ -1,4 +1,4 @@
address@hidden UPDATED 25 April 2006
address@hidden UPDATED-MONTH April 2006
address@hidden UPDATED 8 June 2006
address@hidden UPDATED-MONTH June 2006
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1

Index: version-client.texi
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/version-client.texi,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- version-client.texi 9 May 2006 01:55:03 -0000       1.86
+++ version-client.texi 8 Jun 2006 20:20:48 -0000       1.87
@@ -1,4 +1,4 @@
address@hidden UPDATED 25 April 2006
address@hidden UPDATED-MONTH April 2006
address@hidden UPDATED 8 June 2006
address@hidden UPDATED-MONTH June 2006
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1