On Thu, 2006-01-26 at 10:40 -0800, Mark D. Baushke wrote: [...] > > Is there any other way to clear a sticky -kk option, and get back to the > > default keyword substitution on a modified file? > > You have a few possibilities: > > a) 'cvs commit' commit the file. Then do the 'cvs update -A' > b) 'cvs diff -c filename' > filename.patch > 'mv filename filename.modified' > 'cvs update -A filename' > 'patch < filename.patch' > > > Is there any hope of implementing this feature? > > Patches will be considered if test cases are also provided for sanity.sh > > > If not, would you be interested in a patch to update the documentation > > for -A to indicate that it doesn't clear sticky -k options if the file > > has been modified? > > Yes.
Implementing this feature is a bit beyond what I can do now, but here's a documentation patch to document this behavior. If there's anything that needs to be changed in it please let me know. -- James Juran Senior Secure Systems Analyst XTS-400 Operating Systems BAE Systems Information Technology [EMAIL PROTECTED]
Index: cvs.texinfo
===================================================================
RCS file: /sources/cvs/ccvs/doc/cvs.texinfo,v
retrieving revision 1.674
diff -u -p -r1.674 cvs.texinfo
--- cvs.texinfo 31 Dec 2005 23:34:22 -0000 1.674
+++ cvs.texinfo 18 Feb 2006 16:38:49 -0000
@@ -4162,7 +4162,8 @@ The sticky tags will remain on your work
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
@@ -4921,6 +4922,13 @@ modes. You can now safely merge using @
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
@@ -11493,6 +11501,7 @@ These special options are also available
@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
signature.asc
Description: This is a digitally signed message part
_______________________________________________ Bug-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/bug-cvs
