Christopher Fouts wrote: > cvs -H admin says, for -k, > > -k subst Set keyword substitution mode: > kv (Default) Substitute keyword and value. > > How does one associate "sticky option" with > keyword and value, for example? Are these > words synonymous in the CVS world?
Not quite. The sticky option usually displays the keyword substitution mode set in the file, but that can be overridden on checkout and update. Normally, when you check out a file CVS automatically sets the "sticky option" to the -k value stored in the repository file (and, as you know, this value is set by using the -k option to 'cvs add' and 'cvs admin'). Occasionally, you want to suppress keyword expansion. For example, when merging a file you frequently get conflicts from many of the keywords ($Id$, $Author$, etc.). So, you can tell CVS to suppress keyword expansion when merging: cvs -kk update -j revX -j revY The -k option is sticky, so a subsequent 'cvs stat' on the file will show "sticky option: -kk" Clear as mud now? :=) -- Jim Hyslop Senior Software Designer Leitch Technology International Inc. ( http://www.leitch.com ) Columnist, C/C++ Users Journal ( http://www.cuj.com/experts ) _______________________________________________ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
