Mail Archives: cygwin-developers/2001/06/29/22:25:29
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 -