This is the mail archive of the
cygwin-developers@cygwin.com
mailing list for the Cygwin project.
Re: CVS branches RFC
- To: Robert Collins <robert dot collins at itdomain dot com dot au>
- Subject: Re: CVS branches RFC
- From: Earnie Boyd <earnie_boyd at yahoo dot com>
- Date: Thu, 04 Oct 2001 07:35:49 -0400
- CC: cygwin-developers at cygwin dot Com
- 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> <20011003181839.C3772@redhat.com> <03f301c14c59$dfb6bd20$01000001@lifelesswks>
- Reply-To: CD List <Cygwin-Developers at Cygwin dot Com>
Robert Collins wrote:
>
> ----- Original Message -----
> From: "Christopher Faylor" <cgf@redhat.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