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: <100d01c14550$bd31eaf0$0200a8c0@lifelesswks>
From: "Robert Collins" <robert DOT collins AT itdomain DOT com DOT au>
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>
Subject: Re: CVS branches RFC
Date: Tue, 25 Sep 2001 09:29:20 +1000
MIME-Version: 1.0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
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
X-OriginalArrivalTime: 24 Sep 2001 23:37:14.0305 (UTC) FILETIME=[D6E47B10:01C14551]

----- Original Message -----
From: "Christopher Faylor" <cgf AT redhat DOT com>
> >maint sounds good - room for other things too. If it's ok, I'll
upload
> >the scripts for folk to have a look at.
>
> Sure.  If you want to create the maint directory now and check things
in,
> that would be ok, too.

Done. The end user scripts are there now. I'll pull proper doco together
within the next day.

For now:
* cleanpatch removes cvs -k fluff from a patch, to allow clean
application to different revisions (if no other conflicting changes have
occured)
* cvsclosebranch will delete a branch created by cvsmkbranch, leaving
behind a patch with the last state. (this is rarely used - only when
_no_ further development will be wanted on that branch - ever).
* cvsmerge grabs the most recent changes from a parent branch and
applies them to the branch of the current working dir.
* cvsmergeinit is used to add a new parent to a branch, or to reparent
when you wish to skip changes that occured in the parent (ie the commit
of a huge diff from the same branch).
* cvsmkbranch creates a new branch, from the current sandbox. So if you
have local changes that are heading from "trivial" to "hmm..." you can
run cvsmkbranch foo from within winsup to create a new branch.
* cvsmkpatch makes a patch from a parent branch to the current branch,
cleaning up the cvs fluff, _and_ without running into trouble because of
conflicting changes in the parent.

At squid dev we have a naming convention of:
For single user experiments - private branches - user_topic. i.e.
"rbcollins_fifos".
For collaborative, or potentially collaborative - shared branches -
topic - ie "cygwin_daemon".

Unless someone suggests something 'better', that's the apporach _I_ will
use :}.

Rob