Re: CVS: How to avoid conflicts due to RCS keywords when merging ?

[Martin Baulig <martin home-of-linux org>]

-----BEGIN PGP SIGNED MESSAGE-----

On Sun, 7 Jun 1998, Erik Kluzek wrote:

> To: Martin Baulig <martin@home-of-linux.org>
> Subject: Re: CVS: How to avoid conflicts due to RCS keywords when merging ?
> From: Erik Kluzek <erik@cgd.ucar.edu>
> 
> On Sun, 7 Jun 1998, Martin Baulig wrote:
> 
> > I've got some problem when merging the stable branch of libgtop into
> > the main trunk, because of my '$Id' at the beginning of each C source
> > I get conflicts during the merge in each file which I have to solve
> > manually. Is there some easy way to avoid this, i.e. to tell
> > 'cvs update -j <branch>' to consider files that only differ in RCS
> > keywords as identical ?
> 
> Yes.  When you check-out your working directory add a "-kk" to the command
> line, and add the same on your update.
> 
> cvs checkout -kk <module>
> cvs update -j <branch> -kk
> 
> The "-kk" means don't expand the RCS keywords, so they are effectively
> ignored.

Many thanks, but just one question: is it necessary to restore the default
keywords substitution mode after that or will someone checking the module
out after I did the update automatically get keyword substitution turned
on again?

Martin

- -----------------------------------------------------------------
   Martin Baulig - Angewandte Mathematik - Universitaet Trier

   baulig@castor.uni-trier.de, http://www.home-of-linux.org/
   Key: 1024-bit key with ID C8178435 created 1997/01/24 
   ID:  67 C1 84 A0 47 F5 11 C5  5F 68 4C 84 99 05 C3 92
   Finger me for public key or fetch finger.txt from the url above
- ------------------------------------------------------------------


-----BEGIN PGP SIGNATURE-----
Version: 2.6.3i
Charset: noconv

iQCVAwUBNXrbo4A8K7jIF4Q1AQGOpwQApvHXlacMRIIaAoJYgAM8A6H9Vg94vf7h
3HRnw+wnDeITT6NzSE6pYX/J0ovZLayWrSbbnGpTYRpTLhYGxnhYr9xs1WoNKTSs
f+up59dnNPc5qO1iTRnL2uPOAZpuvyQcjIZ/bdftReG3N5fDg3dE9EzA7fqwhSoi
/tsjLfJfrHE=
=pmHq
-----END PGP SIGNATURE-----