[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/doc cvsclient.texi
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] ccvs/doc cvsclient.texi |
Date: |
Fri, 09 Jun 2006 01:18:05 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Changes by: Derek Robert Price <dprice> 06/06/09 01:18:05
Modified files:
doc : cvsclient.texi
Log message:
Merge changes from 1.11.x.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/cvsclient.texi?cvsroot=cvs&r1=1.145&r2=1.146
Patches:
Index: cvsclient.texi
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/cvsclient.texi,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -b -r1.145 -r1.146
--- cvsclient.texi 8 Jun 2006 20:20:48 -0000 1.145
+++ cvsclient.texi 9 Jun 2006 01:18:05 -0000 1.146
@@ -908,10 +908,13 @@
The @code{Root} request need not have been previously sent.
@item 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.
+Response expected: yes. This request is an alias for @code{noop}. Its
+presence in the list of @code{valid-requests} is intended to be used as a
+placeholder to alert the client that the server does not require the contents
+of files with conflicts that have not been modified since the merge, for
+operations other than diff. It was a bug in pre 1.11.22 & pre 1.12.14 servers
+that the contents of files with conflicts was required for the server to
+acknowledge the existence of the conflicts.
@item Notify @var{filename} \n
Response expected: no.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs/doc cvsclient.texi,
Derek Robert Price <=