cvs-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Derek Robert Price
Subject: [Cvs-cvs] ccvs/doc ChangeLog cvsclient.texi stamp-1 versi... [signed-commits2]
Date: Mon, 12 Dec 2005 19:43:36 +0000

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         signed-commits2
Changes by:     Derek Robert Price <address@hidden>     05/12/12 19:43:36

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

Log message:
        * cvsclient.texi (Responses): Add new Base-* & Temp-checkout responses.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/ChangeLog.diff?only_with_tag=signed-commits2&tr1=1.939.2.1&tr2=1.939.2.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/cvsclient.texi.diff?only_with_tag=signed-commits2&tr1=1.142.4.1&tr2=1.142.4.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/stamp-1.diff?only_with_tag=signed-commits2&tr1=1.74.4.1&tr2=1.74.4.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/version-client.texi.diff?only_with_tag=signed-commits2&tr1=1.74.4.1&tr2=1.74.4.2&r1=text&r2=text

Patches:
Index: ccvs/doc/ChangeLog
diff -u ccvs/doc/ChangeLog:1.939.2.1 ccvs/doc/ChangeLog:1.939.2.2
--- ccvs/doc/ChangeLog:1.939.2.1        Thu Oct 20 21:33:08 2005
+++ ccvs/doc/ChangeLog  Mon Dec 12 19:43:36 2005
@@ -1,3 +1,7 @@
+2005-12-12  Derek Price  <address@hidden>
+
+       * cvsclient.texi (Responses): Add new Base-* & Temp-checkout responses.
+
 2005-10-16  Derek Price  <address@hidden>
 
        * RCSFILES: Note new openpgp-signatures newphrase.
Index: ccvs/doc/cvsclient.texi
diff -u ccvs/doc/cvsclient.texi:1.142.4.1 ccvs/doc/cvsclient.texi:1.142.4.2
--- ccvs/doc/cvsclient.texi:1.142.4.1   Thu Oct 20 21:33:08 2005
+++ ccvs/doc/cvsclient.texi     Mon Dec 12 19:43:36 2005
@@ -1429,7 +1429,9 @@
 When the client is done, it drops the connection.
 
 @node Response intro
address@hidden Introduction to Responses
address@hidden Introduction to R
+Checkout a base file preliminary to a @code{Base-copy} or @code{Base-merge}.
+esponses
 
 After a command which expects a response, the server sends however many
 of the following responses are appropriate.  The server should not send
@@ -1871,6 +1873,64 @@
 
 @item ok \n
 The command completed successfully.
+
address@hidden table
+
+The following responses are all optional, but if one is implemented, then all
+should be.  Servers may make this assumption.
+
address@hidden @code
address@hidden Base-checkout @var{pathname} \n
+Additional data: @var{RCS keyword options}. \n, @var{previous revision}. \n
address@hidden revision}. \n @var{mode}, \n, file transmission.
+
+Checkout a base file preliminary to a @code{Base-copy} or @code{Base-merge}
+response.  If @var{previous revision} is not empty, it should specify the
+previous base revision of this file, as determined by the entry for the file
+sent to the server.  The file transmission will then be an RCS diff, as for the
address@hidden response, but against the previous base file.
+
address@hidden Temp-checkout @var{pathname} \n
+This response is identical to @code{Base-checkout}, except the new file should
+be checked out as a temp file rather than stored with the other base files,
+to avoid overwriting earlier base checkouts.
+
address@hidden Base-copy @var{pathname} \n
+Additional data: @var{revision}. \n @var{flags} \n
+
+Copy a previously transmitted base file for @var{revision}, or the previously
+transmitted temp file when @var{revision} is not specified, over the
+file specified by @var{pathname}.  @var{flags} is two characters.  The
+first, for error checking purposes, is @samp{y} if @var{pathname} is expected
+to exist, @samp{n} if @var{pathname} is not expected to exist, and
address@hidden if @var{pathname} might exist.  The second character must be 
@samp{y}
+if the new @var{pathanme} should be writable and @samp{n}, otherwise.  When
+a temp file is used, it may be deleted and forgotten afterwards.
+
address@hidden Base-merge @var{pathname} \n
+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
+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
+after the merge is complete.
+
address@hidden Base-entry @var{pathname} \n
+Additional data: New Entries line, \n
+
+Use new entry for @var{pathname}.  Any base files for revisions of
address@hidden other than the one specified in the new entries line may now be
+deleted.
+
address@hidden Base-merged @var{pathname} \n
+Additional data: New Entries line, \n
+
+Use new entry for @var{pathname}.  Any base files for revisions of
address@hidden other than the one specified in the new entries line may now be
+deleted.
+
 @end table
 
 @node Text tags
Index: ccvs/doc/stamp-1
diff -u ccvs/doc/stamp-1:1.74.4.1 ccvs/doc/stamp-1:1.74.4.2
--- ccvs/doc/stamp-1:1.74.4.1   Thu Oct 20 21:33:08 2005
+++ ccvs/doc/stamp-1    Mon Dec 12 19:43:36 2005
@@ -1,4 +1,4 @@
address@hidden UPDATED 20 October 2005
address@hidden UPDATED-MONTH October 2005
address@hidden UPDATED 12 December 2005
address@hidden UPDATED-MONTH December 2005
 @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.74.4.1 
ccvs/doc/version-client.texi:1.74.4.2
--- ccvs/doc/version-client.texi:1.74.4.1       Thu Oct 20 21:33:09 2005
+++ ccvs/doc/version-client.texi        Mon Dec 12 19:43:36 2005
@@ -1,4 +1,4 @@
address@hidden UPDATED 20 October 2005
address@hidden UPDATED-MONTH October 2005
address@hidden UPDATED 12 December 2005
address@hidden UPDATED-MONTH December 2005
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]