On 14 May 2013 17:42, Jakob Frank <[email protected]> wrote: > On 13 May 2013 22:13, Peter Ansell <[email protected]> wrote: > > In the Git-Flow methodology there is a temporary "release-N.N.N" branch > > created to bump the version numbers and do QA. This temporary branch is > > then merged into both master and develop so that you never need to have a > > backwards merge from master to develop. > Actually, while writing the proposal I was also thinking exactly about > such a temporary branch for release-preparation. But then I thought, > maybe it's too much branching involved and might get people > confused... > > There is one point I'm not sure about: I'd like to have the final > release-tag on the "master"-branch, but with a "release-N.N.N"-branch > the vote (and so the tag) would be on this branch. > I know it's possible to update/change a tag in git, but Is is allowed > (from an ASF PoV) to modify the tag after the vote (which is > referenced in the vote-mail) in terms of release provenance? Mentors? > > If changing the tag after the vote is no problem, then I'm +1 to > "release-N.N.N"-branches. > > You could experiment to see whether the reference that the tag is linked to is in the history for the master branch after the release-N.N.N branch is merged into it. Tags, and references in general, are not tightly linked to branches in Git, so you shouldn't need to do anything special to have it appear on the master branch after the merge is complete.
Cheers, Peter
