DragonFly BSD
DragonFly users List (threaded) for 2006-04
[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]

Re: Getting nuts with pkgsrc


From: walt <wa1ter@xxxxxxxxxxxxx>
Date: Thu, 20 Apr 2006 10:48:23 -0700

Simon 'corecode' Schubert wrote:
[...]
> 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.

Right.  That is generally what I want, since I'm not a developer
and I don't generally do merges.  I'm generally just testing
patches from other people so I don't want any merge conflicts
and/or 'reversed-patch' errors.



[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]