This is the mail archive of the
cygwin-developers@cygwin.com
mailing list for the Cygwin project.
Re: CVS branches RFC
- To: cygwin-Developers at cygwin dot Com
- Subject: Re: CVS branches RFC
- From: Christopher Faylor <cgf at redhat dot com>
- Date: Wed, 3 Oct 2001 18:18:39 -0400
- References: <0db601c144fe$3ec53ca0$0200a8c0@lifelesswks> <20010924170130.B31556@redhat.com> <0f5701c14546$0bd99280$0200a8c0@lifelesswks> <20010924183659.B32477@redhat.com> <0fc101c1454a$aa8b8010$0200a8c0@lifelesswks> <20010924185131.A32613@redhat.com> <100d01c14550$bd31eaf0$0200a8c0@lifelesswks> <3BBB6ED6.26A88BE3@yahoo.com> <03a501c14c58$2e1dc320$01000001@lifelesswks>
- Reply-To: cygwin-developers at cygwin dot Com
On Thu, Oct 04, 2001 at 08:10:10AM +1000, Robert Collins wrote:
>I find a pthreads bug, and fix it. As it's a production bug the fix goes
>into HEAD. I can
>a) reapply the fix to cygwin_daemon, or
>b) use cvsmerge to get the changes made to HEAD applied to
>cygwin_daemon, which will include that fix.
>
>If Chris fixes something, b) is the _only_ way I'll get the fix
>reliably.
And, FYI, I have been merrily trying to deal with my "simple" change
of adding a path_conv call to build_fhandler. It has had some really
amazing repercussions throughout the code which I'm sure make merging
harder.
I must have unconsciously known that raw devices were a bag of worms
since I was asking other people to test them. Chuck's findings earlier
today showed that I couldn't just ignore devices and hope that they
just worked.
Anyway, I have been making (I think) an unusual number of changes to
the cygwin core lately. I'm sorry if I'm making merging harder. I
hope to stop this soon. I want to release 1.3.4 but it should actually
work when I do so.
cgf