On 21/10/2010 09:20, Thomas Ernest wrote:
Hi,
On 10/12/2010 10:43 AM, Kris Popat wrote:
...
On Mon, Oct 11, 2010 at 10:01 AM, Ross Gardler<[email protected]>
wrote:
...
- once the release is approved and built tag trunk as 0.9.0 or
whatever
My question will probably sounds stupid, but I would like to understand.
Why do we make a tag from trunk and not from the branch ?
Besides, where will be committed changes between branch creation and tag
build : trunk, branch, branch then trunk or trunk then branch ? I mean
there are several cases : bug fix in trunk, bug fix in branch and
probably some other ones ?
That's not a stupid question, it's a very sensible one. It highlights an
error in the proposed process, we should indeed be tagging from the branch.
So:
branch for the release
test and fix bugs in the branch (merging them with trunk)
continue development in trunk (but don't merge anything other than bug
fixes to branch - and only using a review then commit process)
tag from branch (not trunk as we originally agreed)
Ross
