[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Multi-branch development without cvslines or temporary insanity

From: Doug Lee
Subject: Multi-branch development without cvslines or temporary insanity
Date: Wed, 16 Jun 2004 19:26:10 -0400
User-agent: Mutt/1.5.4i

I have a project requiring sometimes up to three branches of
development, not counting the trunk, which I use for cutting-edge
experimental stuff that doesn't get released unless it works and is
then merged onto branches.

Often, I have to work on (and commit to) a particular branch, but then
I need the update to go to other branches and/or the trunk.  The
cvslines utility seems to be aimed at easing this precise problem, but
it works on the premise that I can apply each commit to all branches
at the time of that commit, which would get time-consuming in some
cases.  Also, the environment here is Windows NT/XP with a stand-alone
stock (cvshome) CVS.  I'm not sure how easy it would be to put
cvslines into this environment.

What I'm hoping is that somebody out there has a strategy for
simplifying the process of updating one or more branches (possibly
including the trunk) from a particular branch (which could be the
trunk, AFTER a series of commits have been made to that branch.  Is
there a popular tagging strategy or some other plan for handling this
sort of thing, or is cvslines the best we have?  (Cvslines looks
pretty cool in some respects btw, notably its ability to delay
divergeance until it actually becomes necessary.)

This problem makes me wish we could have named commits or commit sets
with descriptions, so I could say in effect, "Apply commit-sets 12,
13, and 15 to branch A, commit sets 12 and 14 to branch B, and
commit-set 14 to the trunk," where commit-sets 12-15 each consist of
one or more specific commit operations (to specific branches).

Doug Lee           address@hidden
Bartimaeus Group   address@hidden
There is more freedom in knowing how to handle pain than in knowing
how to avoid it.  (4/29/01)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]