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:	Fri, 29 Jun 2001 22:26:04 -0400
From:	Christopher Faylor <cgf AT redhat DOT com>
To:	cygwin-developers AT cygwin DOT com, cygwin-patches AT cygwin DOT com
Subject:	Re: hierarchy in setup (category stuff)
Message-ID:	<20010629222604.A11444@redhat.com>
Reply-To:	cygwin-patches AT cygwin DOT com
Mail-Followup-To:	cygwin-developers AT cygwin DOT com, cygwin-patches AT cygwin DOT com
References:	<06a001c0fc51$7a87e210$0200a8c0 AT lifelesswks> <20010629114004 DOT A6990 AT redhat DOT com> <VA DOT 00000842 DOT 01fd0b44 AT thesoftwaresource DOT com> <20010629172912 DOT A8991 AT redhat DOT com> <032001c100fe$d62310c0$806410ac AT local> <20010629205735 DOT K9607 AT redhat DOT com> <034701c10106$34f6b6e0$806410ac AT local> <036501c10108$b55383c0$806410ac AT local> <20010629221309 DOT A11334 AT redhat DOT com> <038301c1010a$bab7e840$806410ac AT local>
Mime-Version:	1.0
User-Agent:	Mutt/1.3.11i
In-Reply-To:	<038301c1010a$bab7e840$806410ac@local>; from robert.collins@itdomain.com.au on Sat, Jun 30, 2001 at 12:16:52PM +1000

On Sat, Jun 30, 2001 at 12:16:52PM +1000, Robert Collins wrote:
>
>----- Original Message -----
>From: "Christopher Faylor" <cgf AT redhat DOT com>
>To: <cygwin-developers AT cygwin DOT com>; <cygwin-patches AT cygwin DOT com>
>Sent: Saturday, June 30, 2001 12:13 PM
>Subject: Re: hierarchy in setup (category stuff)
>
>
>> On Sat, Jun 30, 2001 at 12:02:24PM +1000, Robert Collins wrote:
>> >Michael,
>> >    I think I trashed some of your src related patches, CVS didn't report
>> >any errors merging, but I just have this nasty suspicion.
>>
>> You did.  All of my changes are gone, too.
>>
>> I'd like to revert CVS to pre-your-change and try again.  Is that ok?
>
>It's possibly easier just to grab the diffs that you committed before and
>apply those again. (ie cvs rdiff -r 2.33 -r 2.35 choose.cc )

I'd tried that (or cvs diff, actually).  There are a lot of rejections
when I do that.

Do you know the revisions of the files that you had in your sandbox?  I
had done checkins to two files on 2001-06-25.  I assume that you were
probably up-to-date with the 2001-06-17 versions of those files previously,
right?

cgf

- Raw text -