Re: Getting nuts with pkgsrc

[joerg@xxxxxxxxxxxxxxxxx]

On Wed, Apr 19, 2006 at 03:33:11PM -0700, walt wrote:
> The 'A' means reset any sticky tags,

A doesn't help if you want to follow a branch.

> 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.

Joerg