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

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         signed-commits3
Changes by:     Derek Robert Price <address@hidden>     06/01/20 22:04:48

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

Log message:
        * cvsclient.text (Requests): Document Base-diff response.
        (Responses): Document Base-diff response.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/ChangeLog.diff?only_with_tag=signed-commits3&tr1=1.944.2.4&tr2=1.944.2.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/cvsclient.texi.diff?only_with_tag=signed-commits3&tr1=1.143.2.2&tr2=1.143.2.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/stamp-1.diff?only_with_tag=signed-commits3&tr1=1.76.2.2&tr2=1.76.2.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/version-client.texi.diff?only_with_tag=signed-commits3&tr1=1.76.2.2&tr2=1.76.2.3&r1=text&r2=text

Patches:
Index: ccvs/doc/ChangeLog
diff -u ccvs/doc/ChangeLog:1.944.2.4 ccvs/doc/ChangeLog:1.944.2.5
--- ccvs/doc/ChangeLog:1.944.2.4        Tue Jan 17 20:09:25 2006
+++ ccvs/doc/ChangeLog  Fri Jan 20 22:04:47 2006
@@ -1,3 +1,8 @@
+2006-01-20  Derek Price  <address@hidden>
+
+       * cvsclient.text (Requests): Document Base-diff response.
+       (Responses): Document Base-diff response.
+
 2006-01-17  Derek Price  <address@hidden>
 
        * RCSFILES: s/signatures/openpgp-signatures/.
Index: ccvs/doc/cvsclient.texi
diff -u ccvs/doc/cvsclient.texi:1.143.2.2 ccvs/doc/cvsclient.texi:1.143.2.3
--- ccvs/doc/cvsclient.texi:1.143.2.2   Mon Jan 16 17:05:11 2006
+++ ccvs/doc/cvsclient.texi     Fri Jan 20 22:04:48 2006
@@ -841,11 +841,16 @@
 affect the @code{ci} request or other relevant requests if any.
 
 @item Signature \n
-Response expect: no.  Additional data: signature transmission.
+Response expected: no.  Additional data: signature transmission.
 Send the server the OpenPGP signature for the next Modified request.
 The OpenPGP signature should be
 @url{http://www.ietf.org/rfc/rfc2440.txt, RFC 2440} compliant.
 
address@hidden Base-diff \n
+Response expected: no.  Additional data: none.
+This is a dummy response intended to let the client know that the contents of
+files do not need to be sent prior to  @code{diff} requests.
+
 @item Modified @var{filename} \n
 Response expected: no.  Additional data: mode, \n, file transmission.
 Send the server a copy of one locally modified file.  @var{filename} is
@@ -1921,7 +1926,7 @@
 Additional data: @var{rev1} \n @var{rev2} \n
 
 Merge the differences between @var{rev1} & @var{rev2} of @var{pathname} into
address@hidden  If one temp file was received via @var{Temp-checkout}, then
address@hidden  If one temp file was received via @code{Temp-checkout}, then
 use it in place of the base file for @var{rev1}.  If two temp files were
 received, then use the first in place of the base file for @var{rev1} and the
 second in place of the base file for @var{rev2}.  Temp files may be deleted
@@ -1941,6 +1946,20 @@
 @var{pathname} other than the one specified in the new entries line may now be
 deleted.
 
address@hidden Base-diff @var{pathname} \n
+Additional data: @var{file-type-1} \n @var{rev1} \n @var{label1} \n
address@hidden \n @var{rev2} \n @var{label2} \n
+
+Perform a diff between two files.  @var{file-type-1} may be @samp{TEMP} or
address@hidden  @var{file-type-2} may be @samp{TEMP}, @samp{DEVNULL}, or
address@hidden  If either file type is @samp{TEMP}, then it is expected that
+the server sent a file in a previous @code{Temp-checkout} request.  Temp files
+are processed in order - if both file types are @samp{TEMP}, then the first
+received by the client must be used as file 1 and the second received by the
+client must be used as file 2.  If either file type is @samp{DEVNULL}, perform
+the diff against an empty file.  If @var{file-type-2} is @samp{WORKFILE}, then
+use the local file specified by @var{pathname} as file 2.
+
 @end table
 
 @node Text tags
Index: ccvs/doc/stamp-1
diff -u ccvs/doc/stamp-1:1.76.2.2 ccvs/doc/stamp-1:1.76.2.3
--- ccvs/doc/stamp-1:1.76.2.2   Mon Jan 16 17:05:11 2006
+++ ccvs/doc/stamp-1    Fri Jan 20 22:04:48 2006
@@ -1,4 +1,4 @@
address@hidden UPDATED 16 January 2006
address@hidden UPDATED 20 January 2006
 @set UPDATED-MONTH January 2006
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1
Index: ccvs/doc/version-client.texi
diff -u ccvs/doc/version-client.texi:1.76.2.2 
ccvs/doc/version-client.texi:1.76.2.3
--- ccvs/doc/version-client.texi:1.76.2.2       Mon Jan 16 17:05:11 2006
+++ ccvs/doc/version-client.texi        Fri Jan 20 22:04:48 2006
@@ -1,4 +1,4 @@
address@hidden UPDATED 16 January 2006
address@hidden UPDATED 20 January 2006
 @set UPDATED-MONTH January 2006
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1