Re: Getting nuts with pkgsrc

[joerg@xxxxxxxxxxxxxxxxx]

On Thu, Apr 20, 2006 at 02:34:19PM +0200, Simon 'corecode' Schubert wrote:
> 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.

I meant that the output of CVS with annotate conflicts from merging with
'C'. Whenever it did they to merge, it creates a copy of the original
file.

Joerg