Mailing-List: contact cygwin-developers-help AT sourceware DOT cygnus DOT com; run by ezmlm
List-Subscribe: <mailto:cygwin-developers-subscribe AT sources DOT redhat DOT com>
List-Archive: <http://sources.redhat.com/ml/cygwin-developers/>
List-Post: <mailto:cygwin-developers AT sources DOT redhat DOT com>
List-Help: <mailto:cygwin-developers-help AT sources DOT redhat DOT com>, <http://sources.redhat.com/ml/#faqs>
Sender: cygwin-developers-owner AT sources DOT redhat DOT com
Delivered-To: mailing list cygwin-developers AT sources DOT redhat DOT com
Date: Thu, 19 Apr 2001 15:48:37 -0400
From: Jason Tishler <Jason DOT Tishler AT dothill DOT com>
To: Cygwin Developers <cygwin-developers AT cygwin DOT com>
Subject: Re: Cvs update and now no Compile of winsup -- need HELP
Message-ID: <20010419154837.B294@dothill.com>
Mail-Followup-To: Cygwin Developers <cygwin-developers AT cygwin DOT com>
References: <VA DOT 00000726 DOT 00306f21 AT thesoftwaresource DOT com> <3ADF0F42 DOT 8AC7F30E AT yahoo DOT com> <VA DOT 00000729 DOT 0015b810 AT thesoftwaresource DOT com> <3ADF3D50 DOT 3CAA6CCC AT yahoo DOT com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <3ADF3D50.3CAA6CCC@yahoo.com>; from earnie_boyd@yahoo.com on Thu, Apr 19, 2001 at 03:32:32PM -0400
Organization: Dot Hill Systems Corp.

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