Path: utzoo!utgpu!news-server.csri.toronto.edu!cs.utexas.edu!uunet!news.uu.net!ns-mx!ccad.uiowa.edu!emcguire
From: emcguire@ccad.uiowa.edu (Ed McGuire)
Newsgroups: comp.unix.misc
Subject: CVS and divergent development
Message-ID: <1991May22.164537.30676@ccad.uiowa.edu>
Date: 22 May 91 16:45:37 GMT
Organization: Sequential Stream_Of_Consciousness
Lines: 31
X-Operating-System: Alliant Concentrix 5.6.00
X-Phone: (319)335-6298

Is there a capability within CVS to support parallel development
of more than one version of the same software derived from a common
ancestor?

Our development plan was initially to freeze code periodically,
tag it with a release name and deliver it, then begin development
of the next planned release.

We have found in practice that it will be necessary to do `bug fix'
releases derived from the originally released version concurrently
with the development of the next planned release.  This leads to
the problem of how to to maintain the `bug fix' release under CVS.

The method we're using right now is pretty crude, requiring careful
bookkeeping:  keeping track of which files were fixed and what their
RCS revision numbers are.

The developer of a `bug fix' release copies out the original release
by tag.  When ready, s/he commits each modified file to a branch
off the original file.  Thus the `bug fix' release consists partly
of original trunk nodes and partly of branch tips.

To tag the `bug fix' release, a new tag synonymous for the original
release is first created.  Then `rcs -N' is used to relink the tag
of each modified source with the branch tip.

Am I missing the obvious?
-- 
peace.  -- Ed
"Over here, Bones!  This man's dying!"
"Damn it, Jim!  I'm a doctor, not a . . .  What did you say?"