[Cvs-cvs] ccvs/doc ChangeLog cvs.1 cvs.texinfo stamp-1 st... [cvs1-11-x-branch]

[Mark D. Baushke]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         cvs1-11-x-branch
Changes by:     Mark D. Baushke <address@hidden>        06/03/20 16:59:44

Modified files:
        doc            : ChangeLog cvs.1 cvs.texinfo stamp-1 stamp-vti 
                         version-client.texi version.texi 

Log message:
        [patch #4965]
        * cvs.texinfo (Sticky tags, Merging and keywords)
        (checkout options, update options): The -A switch
        does not reset sticky -k options on modified files.
        * cvs.1, stamp-1, stamp-vti, version.texi: Regenerated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/ChangeLog.diff?only_with_tag=cvs1-11-x-branch&tr1=1.721.2.118&tr2=1.721.2.119&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/cvs.1.diff?only_with_tag=cvs1-11-x-branch&tr1=1.1.2.23&tr2=1.1.2.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/cvs.texinfo.diff?only_with_tag=cvs1-11-x-branch&tr1=1.545.2.62&tr2=1.545.2.63&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/stamp-1.diff?only_with_tag=cvs1-11-x-branch&tr1=1.9.2.40&tr2=1.9.2.41&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/stamp-vti.diff?only_with_tag=cvs1-11-x-branch&tr1=1.19.2.85&tr2=1.19.2.86&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/version-client.texi.diff?only_with_tag=cvs1-11-x-branch&tr1=1.9.2.40&tr2=1.9.2.41&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/version.texi.diff?only_with_tag=cvs1-11-x-branch&tr1=1.20.2.85&tr2=1.20.2.86&r1=text&r2=text

Patches:
Index: ccvs/doc/ChangeLog
diff -u ccvs/doc/ChangeLog:1.721.2.118 ccvs/doc/ChangeLog:1.721.2.119
--- ccvs/doc/ChangeLog:1.721.2.118      Wed Mar  1 21:58:19 2006
+++ ccvs/doc/ChangeLog  Mon Mar 20 16:59:44 2006
@@ -1,3 +1,11 @@
+2006-03-20  Mark D. Baushke  <address@hidden>
+
+       [patch #4965]
+       * cvs.texinfo (Sticky tags, Merging and keywords)
+       (checkout options, update options): The -A switch
+       does not reset sticky -k options on modified files.
+       * cvs.1, stamp-1, stamp-vti, version.texi: Regenerated.
+
 2006-02-28  Derek Price  <address@hidden>
 
        * cvs.texinfo (Editing administrative files): Import changes from Wiki.
Index: ccvs/doc/cvs.1
diff -u ccvs/doc/cvs.1:1.1.2.23 ccvs/doc/cvs.1:1.1.2.24
--- ccvs/doc/cvs.1:1.1.2.23     Thu Nov 10 18:16:35 2005
+++ ccvs/doc/cvs.1      Mon Mar 20 16:59:44 2006
@@ -1286,6 +1286,7 @@
 \fB-A\fR
 .IP "" 2
 Reset any sticky tags, dates, or \fB-k\fR options.
+Does not reset sticky \fB-k\fR options on modified files.
 See see node `Sticky tags\(aq in the CVS manual, for more information on 
sticky tags/dates.
 .SP
 .IP "" 0
@@ -3503,6 +3504,7 @@
 \fB-A\fR
 .IP "" 2
 Reset any sticky tags, dates, or \fB-k\fR options.
+Does not reset sticky \fB-k\fR options on modified files.
 See see node `Sticky tags\(aq in the CVS manual, for more information on 
sticky tags/dates.
 .SP
 .IP "" 0
Index: ccvs/doc/cvs.texinfo
diff -u ccvs/doc/cvs.texinfo:1.545.2.62 ccvs/doc/cvs.texinfo:1.545.2.63
--- ccvs/doc/cvs.texinfo:1.545.2.62     Wed Mar  1 21:58:19 2006
+++ ccvs/doc/cvs.texinfo        Mon Mar 20 16:59:44 2006
@@ -3841,7 +3841,8 @@
 you delete them with @samp{cvs update -A}.  The
 @samp{-A} option merges local changes into the version of the
 file from the head of the trunk, removing any sticky tags,
-dates, or options.  See @ref{update} for more on the operation
+dates, or options (other than sticky @samp{-k} options on locally
+modified files).  See @ref{update} for more on the operation
 of @code{cvs update}.
 
 @cindex Sticky date
@@ -4629,6 +4630,13 @@
 committed and check it out again.
 @end ignore
 
+As a result of using @samp{-kk} during the merge, each file examined by the
+update will have @samp{-kk} set as sticky options.  Running @code{update -A}
+will clear the sticky options on unmodified files, but it will not clear
+the sticky options on modified files.  To get back to the default keyword
+substitution for modified files, you must commit the results of the merge
+and then run @code{update -A}.
+
 @c ---------------------------------------------------------------------
 @node Recursive behavior
 @chapter Recursive behavior
@@ -8869,6 +8877,7 @@
 @table @code
 @item -A
 Reset any sticky tags, dates, or @samp{-k} options.
+Does not reset sticky @samp{-k} options on modified files.
 See @ref{Sticky tags}, for more information on sticky tags/dates.
 
 @item -c
@@ -10794,6 +10803,7 @@
 @table @code
 @item -A
 Reset any sticky tags, dates, or @samp{-k} options.
+Does not reset sticky @samp{-k} options on modified files.
 See @ref{Sticky tags}, for more information on sticky tags/dates.
 
 @item -C
Index: ccvs/doc/stamp-1
diff -u ccvs/doc/stamp-1:1.9.2.40 ccvs/doc/stamp-1:1.9.2.41
--- ccvs/doc/stamp-1:1.9.2.40   Fri Dec  9 17:51:36 2005
+++ ccvs/doc/stamp-1    Mon Mar 20 16:59:44 2006
@@ -1,4 +1,4 @@
address@hidden UPDATED 9 December 2005
address@hidden UPDATED 14 December 2005
 @set UPDATED-MONTH December 2005
 @set EDITION 1.11.21.1
 @set VERSION 1.11.21.1
Index: ccvs/doc/stamp-vti
diff -u ccvs/doc/stamp-vti:1.19.2.85 ccvs/doc/stamp-vti:1.19.2.86
--- ccvs/doc/stamp-vti:1.19.2.85        Wed Mar  1 21:58:19 2006
+++ ccvs/doc/stamp-vti  Mon Mar 20 16:59:44 2006
@@ -1,4 +1,4 @@
address@hidden UPDATED 28 February 2006
address@hidden UPDATED-MONTH February 2006
address@hidden UPDATED 20 March 2006
address@hidden UPDATED-MONTH March 2006
 @set EDITION 1.11.21.1
 @set VERSION 1.11.21.1
Index: ccvs/doc/version-client.texi
diff -u ccvs/doc/version-client.texi:1.9.2.40 
ccvs/doc/version-client.texi:1.9.2.41
--- ccvs/doc/version-client.texi:1.9.2.40       Fri Dec  9 17:51:36 2005
+++ ccvs/doc/version-client.texi        Mon Mar 20 16:59:44 2006
@@ -1,4 +1,4 @@
address@hidden UPDATED 9 December 2005
address@hidden UPDATED 14 December 2005
 @set UPDATED-MONTH December 2005
 @set EDITION 1.11.21.1
 @set VERSION 1.11.21.1
Index: ccvs/doc/version.texi
diff -u ccvs/doc/version.texi:1.20.2.85 ccvs/doc/version.texi:1.20.2.86
--- ccvs/doc/version.texi:1.20.2.85     Wed Mar  1 21:58:19 2006
+++ ccvs/doc/version.texi       Mon Mar 20 16:59:44 2006
@@ -1,4 +1,4 @@
address@hidden UPDATED 28 February 2006
address@hidden UPDATED-MONTH February 2006
address@hidden UPDATED 20 March 2006
address@hidden UPDATED-MONTH March 2006
 @set EDITION 1.11.21.1
 @set VERSION 1.11.21.1