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
X-Apparently-From:	<earnie?boyd AT yahoo DOT com>
Message-ID:	<3BBC4995.CA82EBCA@yahoo.com>
Date:	Thu, 04 Oct 2001 07:35:49 -0400
From:	Earnie Boyd <earnie_boyd AT yahoo DOT com>
Reply-To:	CD List <Cygwin-Developers AT Cygwin DOT Com>
X-Mailer:	Mozilla 4.77 [en] (WinNT; U)
X-Accept-Language:	en
MIME-Version:	1.0
To:	Robert Collins <robert DOT collins AT itdomain DOT com DOT au>
CC:	cygwin-developers AT Cygwin DOT Com
Subject:	Re: CVS branches RFC
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> <20011003181839 DOT C3772 AT redhat DOT com> <03f301c14c59$dfb6bd20$01000001 AT lifelesswks>

Robert Collins wrote:
> 
> ----- Original Message -----
> From: "Christopher Faylor" <cgf AT redhat DOT com>
> >
> > 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'm sure you'll be pleasantly surprised to know that it has been
> trivial. I have been merging every day or two and had no conflicts
> anywhere except ChangeLog - which is expected as cvs doesn't grok
> ChangeLog and simply considers it a text file changed at the top twice.
> 

The ChangeLog issue could be handled by creating a ChangeLog.$(branch)
file.  Your branch changes would be recorded there and then you could
filter them into the ChangeLog before committing them to the HEAD.

> Which, BTW is why I suggested these scripts - small they are, but
> powerful too :}.
> 

Yep. And Chris could have created a branch for his changes so as to not
destroy a working snapshot.  ;D.

Earnie.

_________________________________________________________
Do You Yahoo!?
Get your free @yahoo.com address at http://mail.yahoo.com

- Raw text -