Getting nuts with pkgsrc

Thu Apr 20 05:34:30 PDT 2006

On 20.04.2006, at 13:36, joerg at 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pgp00005.pgp
Type: application/octet-stream
Size: 186 bytes
Desc: "Description: This is a digitally signed message part"
URL: <http://lists.dragonflybsd.org/pipermail/users/attachments/20060420/44b3bd09/attachment-0021.obj>