Ethereal-dev: Re: [Ethereal-dev] CVS question

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

Date Index Thread Index Other Months All Mailing Lists
Date Prev Date Next Thread Prev Thread Next
From: Guy Harris <gharris@xxxxxxxxx>
Date: Sun, 25 Nov 2001 13:09:59 -0800
On Sun, Nov 25, 2001 at 10:47:06AM -0500, Nisbet, Tom wrote:
> When working on Ethereal, are there any CVS commands needed to tell the
> system
> that you are working on a file so that local changes don't get stomped by
> a "cvs update" command?

No.  If you've modified the file, CVS will notice that, and a "cvs
update" will cause it to merge the checked-in changes with your changes.

This merge process can, of course, fail, in which case you'll have to
manually resolve the conflicts yourself.