[Cvs-cvs] ccvs/doc ChangeLog cvsclient.texi stamp-1 versi... [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/08 19:58:06

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

Log message:
        * cvsclient.texi (Requests): Add Empty-conflicts.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.721.2.119&r2=1.721.2.120
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/cvsclient.texi?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.130.6.4&r2=1.130.6.5
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/stamp-1?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.9.2.42&r2=1.9.2.43
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/version-client.texi?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.9.2.42&r2=1.9.2.43

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/ChangeLog,v
retrieving revision 1.721.2.119
retrieving revision 1.721.2.120
diff -u -b -r1.721.2.119 -r1.721.2.120
--- ChangeLog   20 Mar 2006 16:59:44 -0000      1.721.2.119
+++ ChangeLog   8 Jun 2006 19:58:06 -0000       1.721.2.120
@@ -1,3 +1,7 @@
+2006-06-08  Derek Price  <address@hidden>
+
+       * cvsclient.texi (Requests): Add Empty-conflicts.
+
 2006-03-20  Mark D. Baushke  <address@hidden>
 
        [patch #4965]

Index: cvsclient.texi
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/cvsclient.texi,v
retrieving revision 1.130.6.4
retrieving revision 1.130.6.5
diff -u -b -r1.130.6.4 -r1.130.6.5
--- cvsclient.texi      9 Dec 2005 17:51:36 -0000       1.130.6.4
+++ cvsclient.texi      8 Jun 2006 19:58:06 -0000       1.130.6.5
@@ -872,6 +872,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.9.2.42
retrieving revision 1.9.2.43
diff -u -b -r1.9.2.42 -r1.9.2.43
--- stamp-1     25 May 2006 15:11:48 -0000      1.9.2.42
+++ stamp-1     8 Jun 2006 19:58:06 -0000       1.9.2.43
@@ -1,4 +1,4 @@
address@hidden UPDATED 9 December 2005
address@hidden UPDATED-MONTH December 2005
address@hidden UPDATED 8 June 2006
address@hidden UPDATED-MONTH June 2006
 @set EDITION 1.11.21.1
 @set VERSION 1.11.21.1

Index: version-client.texi
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/version-client.texi,v
retrieving revision 1.9.2.42
retrieving revision 1.9.2.43
diff -u -b -r1.9.2.42 -r1.9.2.43
--- version-client.texi 25 May 2006 15:11:48 -0000      1.9.2.42
+++ version-client.texi 8 Jun 2006 19:58:06 -0000       1.9.2.43
@@ -1,4 +1,4 @@
address@hidden UPDATED 9 December 2005
address@hidden UPDATED-MONTH December 2005
address@hidden UPDATED 8 June 2006
address@hidden UPDATED-MONTH June 2006
 @set EDITION 1.11.21.1
 @set VERSION 1.11.21.1