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
Message-ID:	<03a501c14c58$2e1dc320$01000001@lifelesswks>
From:	"Robert Collins" <robert DOT collins AT itdomain DOT com DOT au>
To:	"CD List" <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>
Subject:	Re: CVS branches RFC
Date:	Thu, 4 Oct 2001 08:10:10 +1000
MIME-Version:	1.0
X-Priority:	3
X-MSMail-Priority:	Normal
X-Mailer:	Microsoft Outlook Express 5.50.4133.2400
X-MimeOLE:	Produced By Microsoft MimeOLE V5.50.4133.2400

----- Original Message -----
From: "Earnie Boyd" <earnie_boyd AT yahoo DOT com>
To: "CD List" <Cygwin-Developers AT Cygwin DOT 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.

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.

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.

Rob

- Raw text -