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:26:57 -0400
- CC: CD List <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>
- Reply-To: CD List <Cygwin-Developers at Cygwin dot Com>
Robert Collins wrote:
>
> ----- Original Message -----
> From: "Earnie Boyd" <earnie_boyd@yahoo.com>
> To: "CD List" <Cygwin-Developers@Cygwin.Com>
> Sent: Thursday, October 04, 2001 6:02 AM
> Subject: Re: CVS branches RFC
>
> > Robert Collins wrote:
> > >
> > > * cvsmerge grabs the most recent changes from a parent branch and
> > > applies them to the branch of the current working dir.
> >
> > And this is used for what purpose? Would it be something like: two
> > developers working the same branch synchronizing their changes?
>
> No, CVS does that when you commit and update within a single branch.
>
Doh, of course.
> Consider this:
> HEAD
> \-cygwin_daemon
>
> 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.
>
> cvsmerge grabs _all_ the changes to the parent branch and applies them.
>
> If there are conflicts you get a log to examine and an instruction to
> correct the warnings before exiting the sub-shell that has been invoked.
>
Ok, great.
> It's only not appropriate to merge these changes down if you are forking
> the development - which we are not. Therefore we want all the HEAD fixes
> and improvements in any development branches.
>
I'm considering other purposes besides Cygwin. Yes they're great.
Earnie.
_________________________________________________________
Do You Yahoo!?
Get your free @yahoo.com address at http://mail.yahoo.com