[Cvs-cvs] ccvs/doc ChangeLog cvs.1 cvs.texinfo stamp-1 ve...

[Mark D. Baushke]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Mark D. Baushke <address@hidden>        06/03/20 17:06:55

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

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/ChangeLog.diff?tr1=1.948&tr2=1.949&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/cvs.1.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/cvs.texinfo.diff?tr1=1.675&tr2=1.676&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/stamp-1.diff?tr1=1.78&tr2=1.79&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/version-client.texi.diff?tr1=1.78&tr2=1.79&r1=text&r2=text

Patches:
Index: ccvs/doc/ChangeLog
diff -u ccvs/doc/ChangeLog:1.948 ccvs/doc/ChangeLog:1.949
--- ccvs/doc/ChangeLog:1.948    Mon Mar 20 02:21:55 2006
+++ ccvs/doc/ChangeLog  Mon Mar 20 17:06:54 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-03-19  Mark D. Baushke  <address@hidden>
 
        * Makefile.in: Regenerated.
Index: ccvs/doc/cvs.1
diff -u ccvs/doc/cvs.1:1.39 ccvs/doc/cvs.1:1.40
--- ccvs/doc/cvs.1:1.39 Sun Jan  1 00:45:49 2006
+++ ccvs/doc/cvs.1      Mon Mar 20 17:06:54 2006
@@ -1325,6 +1325,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
@@ -3769,6 +3770,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.675 ccvs/doc/cvs.texinfo:1.676
--- ccvs/doc/cvs.texinfo:1.675  Wed Mar  1 21:59:48 2006
+++ ccvs/doc/cvs.texinfo        Mon Mar 20 17:06:54 2006
@@ -4170,7 +4170,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
@@ -4929,6 +4930,13 @@
 on lines containing RCS keywords, even when your repository contains
 binary files.
 
+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
@@ -9388,6 +9396,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
@@ -11501,6 +11510,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.78 ccvs/doc/stamp-1:1.79
--- ccvs/doc/stamp-1:1.78       Mon Jan 30 23:19:05 2006
+++ ccvs/doc/stamp-1    Mon Mar 20 17:06:54 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.12.13.1
 @set VERSION 1.12.13.1
Index: ccvs/doc/version-client.texi
diff -u ccvs/doc/version-client.texi:1.78 ccvs/doc/version-client.texi:1.79
--- ccvs/doc/version-client.texi:1.78   Mon Jan 30 23:19:05 2006
+++ ccvs/doc/version-client.texi        Mon Mar 20 17:06:54 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.12.13.1
 @set VERSION 1.12.13.1