[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Branched and non-branched work flows?

From: Bob Archer <bob.archer_at_amsi.com>
Date: Mon, 1 Jun 2009 15:11:57 -0400

> Here's how we do it:
> Let's assume we're about to release version 9.1.0 of our product.
> We pull a release branch (named "9.1" from trunk as late as possible,
> but before any changes not relevant to that release go into trunk.
> (This works well enough since we work iteratively and know what the
> tasks for the coming iteration are.)
> - At this point, trunk is -- in essence -- the development branch for
> "9.2".
> - On the branch "9.1", we are preparing for the release "9.1.0".
> - Only fixes intended to be included in "9.1.0" go into the this branch.
> - Commits to "9.1" are generally merged to trunk.
> - Changes to trunk are not merged to "9.1".
> - At some point, we make a release, from branch "9.1", tagging it as
> "9.1.0".
> - Now branch "9.1" is the release branch for 9.1.1
> (Lather, rinse, repeat)
> - When trunk is nearing 9.2 release, pull a branch "9.2".
> - Trunk becomes development for "9.3".
> - The branch "9.1" is generally discarded shortly after 9.2.0 has been
> tagged.

That's pretty close to how we do it to. But, we build, test and release from trunk. We don't allow v+1 to be checked into trunk until the release is gold. (If there is need we create a temp branch for v+1, but this doesn't happen often.)

Once we release we tag the release and also create a branch from the just release product. That branch is used for fixes to that release. The fixes are checked into the branch and merged into trunk and the fixes to the branch release are built from the branch.

The biggest pain for us right now is setting up CI on our branches. But I am in the process of making our build scripts smarter and using relative pathing so that getting a build running on a branch is no more difficult than modifying the svn path in the ccnet.config file that is in the branch and adding an include to the main ccnet.config file pointing to that new branch wc.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-06-01 21:13:02 CEST

This is an archived mail posted to the Subversion Users mailing list.