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: Wed, 3 Oct 2001 18:18:39 -0400
From: Christopher Faylor <cgf AT redhat DOT com>
To: cygwin-Developers AT cygwin DOT Com
Subject: Re: CVS branches RFC
Message-ID: <20011003181839.C3772@redhat.com>
Reply-To: cygwin-developers AT cygwin DOT Com
Mail-Followup-To: cygwin-Developers AT cygwin DOT Com
References: <0db601c144fe$3ec53ca0$0200a8c0 AT lifelesswks> <20010924170130 DOT B31556 AT redhat DOT com> <0f5701c14546$0bd99280$0200a8c0 AT lifelesswks> <20010924183659 DOT B32477 AT redhat DOT com> <0fc101c1454a$aa8b8010$0200a8c0 AT lifelesswks> <20010924185131 DOT A32613 AT redhat DOT com> <100d01c14550$bd31eaf0$0200a8c0 AT lifelesswks> <3BBB6ED6 DOT 26A88BE3 AT yahoo DOT com> <03a501c14c58$2e1dc320$01000001 AT lifelesswks>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <03a501c14c58$2e1dc320$01000001@lifelesswks>
User-Agent: Mutt/1.3.21i

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