On 11/10/2010 04:06, Scott Wilson wrote:
(Maybe we need another discussion around branching strategy - e.g. do
we have different branches for release versions (e.g. a 0.9.0 branch
and a 0.9.1. branch), or do we keep on having the current code in
trunk and just do potentially-disruptive feature development in
branches?)
There are many ways of doing this. The way I personally prefer (but
never insist upon, others should suggest alternatives) is:
- at code freeze for a release create a branch in which the release will
be built (this allows development to continue in trunk even while
release build and testing is underway)
- once the release is approved and built tag trunk as 0.9.0 or whatever
- use the branch for maintenance of the release (i.e. security fixes
that can't wait for the next release from trunk)
Creating branches for disruptive features is important to allow people
to continue to develop in trunk. However, they should only be created
when really necessary as it can be difficult to maintain a branch.
Whatever policy is adopted needs to be documented in the relase
management documents I hope Kris will put together as he works through
this process.
Ross
