From owner-freebsd-hackers  Tue Sep 30 23:57:42 1997
Return-Path: <owner-freebsd-hackers>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id XAA23525
          for hackers-outgoing; Tue, 30 Sep 1997 23:57:42 -0700 (PDT)
Received: from freebie.lemis.com (gregl1.lnk.telstra.net [139.130.136.133])
          by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id XAA23517
          for <freebsd-hackers@FreeBSD.ORG>; Tue, 30 Sep 1997 23:57:18 -0700 (PDT)
Received: (from grog@localhost)
	by freebie.lemis.com (8.8.7/8.8.5) id QAA18210;
	Wed, 1 Oct 1997 16:26:46 +0930 (CST)
Message-ID: <19971001162645.28059@lemis.com>
Date: Wed, 1 Oct 1997 16:26:45 +0930
From: Greg Lehey <grog@lemis.com>
To: Chris Csanady <ccsanady@bob.scl.ameslab.gov>
Cc: freebsd-hackers@FreeBSD.ORG
Subject: Re: CVS and branches..
References: <199710010604.BAA02252@bob.scl.ameslab.gov>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Mailer: Mutt 0.84e
In-Reply-To: <199710010604.BAA02252@bob.scl.ameslab.gov>; from Chris Csanady on Wed, Oct 01, 1997 at 01:04:51AM -0500
Organisation: LEMIS, PO Box 460, Echunga SA 5153, Australia
Phone: +61-8-8388-8250
Fax: +61-8-8388-8250
Mobile: +61-41-739-7062
WWW-Home-Page: http://www.lemis.com/~grog
Fight-Spam-Now: http://www.cauce.org
Sender: owner-freebsd-hackers@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

On Wed, Oct 01, 1997 at 01:04:51AM -0500, Chris Csanady wrote:
> I have a very basic understanding of CVS, but I'm not exactly sure how
> branches fit into the whole thing.  Basically, I want to create a branch
> of my own that I can work, while remaining current as well.  How do I
> go about this?
>
> I was thinking that I would need a cvsup'd copy of the current repository,
> as well as a local one, and then keep them in sync.  Then I would create a
> branch in my local repository, and periodically merge the current one in
> with it.  In the end, I would like to produce diffs against current that
> would be suitable for inclusion.
>
> If this is fairly close to reality, could someone briefly explain how
> you actually accomplish this? (Perhaps even usesable cvs command syntax)

I have a document on this subject, part of the upcoming second edition
of "The Complete FreeBSD".  If you're interested in reviewing this
(which means sending me back detailled comments on the text), please
contact me and I'll arrange to get it to you.

Greg