[Bioperl-l] CLEANUP: branch 07 to head ;cvs $Id lines

Aaron J Mackey Aaron J. Mackey" <amackey@virginia.edu
Wed, 16 May 2001 06:15:34 -0400 (EDT)


On Wed, 16 May 2001, Heikki Lehvaslaiho wrote:

> I just got from Ewan that cvs $Id: $ lines should not really be in
> files and I can really see why: every single file merge is complaining
> about conflicts and they have to be manually resolved.

That's why you use the -kkv update/checkout options so that keyword
substitution doesn't bite you while you merge.  There's no problem having
Name/ID in files, as long as you remember what to do.  There's a second -k
option that's useful when "exporting" (i.e. packing up for distribution),
that strips the keywords and only leaves the values (so that your code may
be safely imported into someone else's CVS repository).

I may have the -kkv wrong - I always goto the page I have flagged in my
Cedervist manual.  But the idea remains.

-Aaron