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

[Ewan Birney]

On Wed, 16 May 2001, Heikki Lehvaslaiho wrote:

> 
> Ahhh! So that's how it is done. According to co man page the correct
> option is -kk: 'cvs update -kk'.
> 
> I am glad I can leave those $Id line in there. They are useful.
> 

Thanks for the education as well. I had not realised that you could do
this... hmmm...


> Thousand thanks,
> 
> 		-Heikki
> 
> Aaron J Mackey wrote:
> > 
> > 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
> 
> -- 
> ______ _/      _/_____________________________________________________
>       _/      _/                      http://www.ebi.ac.uk/mutations/
>      _/  _/  _/  Heikki Lehvaslaiho          heikki@ebi.ac.uk
>     _/_/_/_/_/  EMBL Outstation, European Bioinformatics Institute
>    _/  _/  _/  Wellcome Trust Genome Campus, Hinxton
>   _/  _/  _/  Cambs. CB10 1SD, United Kingdom
>      _/      Phone: +44 (0)1223 494 644   FAX: +44 (0)1223 494 468
> ___ _/_/_/_/_/________________________________________________________
> _______________________________________________
> Bioperl-l mailing list
> Bioperl-l@bioperl.org
> http://bioperl.org/mailman/listinfo/bioperl-l
> 

-----------------------------------------------------------------
Ewan Birney. Mobile: +44 (0)7970 151230, Work: +44 1223 494420
<birney@ebi.ac.uk>. 
-----------------------------------------------------------------