Mail Archives: cygwin-developers/2001/04/19/16:35:46
Earnie,
On Thu, Apr 19, 2001 at 03:32:32PM -0400, Earnie Boyd wrote:
> It was the changes to cinstall. You'll have to merge the changes made
> to choose.cc with your working copy; it doesn't happen with just the
> `cvs update'.
Actually, cvs update *does* attempt to perform a merge, if necessary.
However, if there is a conflict, then you will have to fix the hunks
that failed. Also, cvs saves your pre-merged file in a backup file
called something like .#foo.$version (IIRC) which can be useful during
conflict resolution.
Jason
--
Jason Tishler
Director, Software Engineering Phone: +1 (732) 264-8770 x235
Dot Hill Systems Corp. Fax: +1 (732) 264-8798
82 Bethany Road, Suite 7 Email: Jason DOT Tishler AT dothill DOT com
Hazlet, NJ 07730 USA WWW: http://www.dothill.com
- Raw text -