Re: Getting nuts with pkgsrc

["Simon 'corecode' Schubert" <corecode@xxxxxxxxxxxx>]

On 20.04.2006, at 13:36, joerg@xxxxxxxxxxxxxxxxx wrote:
> > and the 'C' means
> > move-and-rename (rather than delete) any locally modified
> > files.
>
> and 'C' prevents cvs from merging.
>
> > This means that all of your local edits will be preserved
> > (rather than deleted) when you update your CVS repository.
>
> cvs doesn *not* delete local changes. It tries to merge them, and
> annotates with 'C' any conflicts.

if updating with -C you will actually lose the changes made (but i 
think they will be moved to a .#file.rev), otoh, you won't get merge 
conflicts.

cheers
  simon

--
Serve - BSD     +++  RENT this banner advert  +++    ASCII Ribbon   /"\
Work - Mac      +++  space for low €€€ NOW!1  +++      Campaign     \ /
Party Enjoy Relax   |   http://dragonflybsd.org      Against  HTML   \
Dude 2c 2 the max   !   http://golden-apple.biz       Mail + News   / \

Attachment: PGP.sig
Description: This is a digitally signed message part