How we use Git

[David Lawrence]

Sorry so late to the discussion. This got lost in my inbox unfortunately.

On 11/03/2014 12:05 PM, Gervase Markham wrote:
> On 03/11/14 16:58, Mark Côté wrote:
>> Anyway, if we're all in agreement, I can go back and add release-X.Y[.Z]
>> and release-X.Y-stable tags and delete the bugzilla-stable tag (the
>> latter being the last push -f we'll hopefully ever need).
> 
> I'd like to hear from dkl as release manager first.
> 
> So here's a summary of the plan:
> 
> 1) Add "release-X.Y[.Z]" tags for every bugzilla-X.Y[.Z] tag back to the
> beginning of time

This is fine. I will just have to remember that for BZR we would still
use bugzilla-X.Y[.Z]. Would love to switch there as well but as
LpSolit mentioned, it would break legacy scripts for users most likely.
With Git it is new enough for us we can make those types of changes early on.

> 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 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?

> 3) Delete the bugzilla-stable tag

Also fine.

> 4) Update the release process documentation:
>    * Change the name of the tag to be created at the release point
>    * Add "Create or update the release-X.Y-stable branch" as a step
>    * Remove anything about updating the bugzilla-stable tag

I will do that once I figure out the command sequence.

> 5) Update the new docs to use the simple git commands outlined up-thread

Sounds good.

dkl

-- 
David Lawrence
dkl at mozilla.com