How we use Git

[Gervase Markham]

On 12/11/14 14:48, David Lawrence wrote:
>> 2) Add a bugzilla-X.Y-stable branch for all supported releases (4.0,
>> 4.2, 4.4) pointing at the same place as the most recent release tag
> 
> Fine. But would we call this release-X.Y-stable in line with the new tag
> naming?

I think not, because they are branches, not tags, and so they "move".
But see below - I think there's a misunderstanding here.

> I will have to get with Mark on how this would work command wise.
> For example, when the bugzilla-4.4-stable branch is created, no commits
> are made to it ever. So when we release the next minor version of 4.4, then
> we delete the old bugzilla-4.4-stable branch completely and create the new
> one in the new location. Is that basically it?

No. You would merge the "4.4" branch to the "bugzilla-4.4-stable"
branch. This would always be a fast-forward merge because the
"bugzilla-4.4-stable" branch would never have independent checkins, it
would just accept merges from 4.4.

The commands would be:

<finalise 4.4.XX release on branch "4.4">
git checkout bugzilla-4.4-stable
git merge 4.4
git commit

(I believe.)

Then, people could update to "bugzilla-4.4-stable" and always get
exactly the latest stable release. Whereas "4.4" bumbles along one
commit at a time, "bugzilla-4.4-stable" jumps along from release to release.

Does it now make more sense why it's called "bugzilla-4.4-stable" rather
than "release-4.4-stable"? Calling it "release-" sort of suggests it's a
particular release and won't change. But that's not what happens.

Gerv
_______________________________________________
dev-apps-bugzilla mailing list
dev-apps-bugzilla at lists.mozilla.org
https://lists.mozilla.org/listinfo/dev-apps-bugzilla