>I have a problem updating files in a branch containing keywords. [...]
>Updating generates a conflict like the following:
>
><<<<<<< Rvr.make
># Version : $Revision: 1.10.4.1 $
>=======
># Version : $Revision: 1.12 $
>>>>>>>> 1.12
You don't want to have RCS keywords expanded on checkouts. Check out
the the Cederqvist on the "cvs co/update -k kopt" options available to
you when you do the next "cvs co" or "cvs upd" to fix your setup.
You'll want to use a "-kk" or a "-A", depending on how you got into
your current state of affairs.
Without keyword expansion, the information is still available in a
working directory through "cvs status" and "cvs log".
The only moment when you want to expand keywords is usually
"cvs export".
By default, "cvs checkout" and "cvs export" do the Right Thing
with respect to keywword expansion. (At least std command line
cvs and WinCVS. Don't know about things like tkCVS.) That's
why "-A" may be an option for you, but only you can tell.
Martin Neitzel
