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
Message-ID:	<03be01c1010c$bb97af00$806410ac@local>
From:	"Robert Collins" <robert DOT collins AT itdomain DOT com DOT au>
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> <20010629222604 DOT A11444 AT redhat DOT com>
Subject:	Re: hierarchy in setup (category stuff)
Date:	Sat, 30 Jun 2001 12:31:13 +1000
MIME-Version:	1.0
X-Priority:	3
X-MSMail-Priority:	Normal
X-Mailer:	Microsoft Outlook Express 5.50.4522.1200
X-MimeOLE:	Produced By Microsoft MimeOLE V5.50.4522.1200
X-OriginalArrivalTime:	30 Jun 2001 02:18:49.0946 (UTC) FILETIME=[0001A3A0:01C1010B]

----- Original Message -----
From: "Christopher Faylor" <cgf AT redhat DOT com>
d
> >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.

Yeah, things have moved up and down a bit :].

> 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?

I was fully up to date barring the last two checking. (When I merged I got
two new changelog entries. I checked in 2.36 of choose.cc, thus I had 2.33
intact, and got 2.34 and 2.35 merged in badly.

my just sent patch misses a couple of changes, I'm just sorting those out
for you now.

> cgf
>

- Raw text -