On Thu, 2004-02-12 at 15:35 -0500, David Wendt wrote:
Use option -kk when merging. This disables RCS keyword
expansion.
Thanks; I made a note about that in design.doc and forgot to mention it
here. From the URL I quoted in my previous message:
https://www.cvshome.org/docs/manual/cvs-1.11.18/cvs_5.html#SEC64
"There is, however, one major caveat with using `-kk' on merges.
Namely, it overrides whatever keyword expansion mode CVS would
normally have used. In particular, this is a problem if the mode
had been `-kb' for a binary file. Therefore, if your repository
contains binary files, you will need to deal with the conflicts
rather than using `-kk'."
There are other ways to work around this, but it means additional work
for the release manager at merge time.
~ESP
--
Evan Prodromou <evan(a)wikitravel.org>