How we use Git

[Mark Côté]

Let me just summarize what we decided:

* We will stop using the tag "bugzilla-X.Y[.Z]" to indicate releases;
instead, we'll use "release-X.Y[.Z]".  We'll keep existing tags of the
former format, but we'll add the new-style tags to them as well, and
only use the new style going forward.

* We will create a lightweight branch off of each release branch named
"release-X.Y-stable", the HEAD of which will always point to the last
release-X.Y[.Z] tag of the X.Y branch, and which will never diverge from
the release branch (i.e. the HEAD of release-X.Y-stable will always
point to a commit somewhere in the X.Y branch and will only be
fast-forwarded when new releases are created).  Are we okay doing this
to supported branches (4.0, 4.2, 4.4) only?

* We will delete bugzilla-stable and stop using it.

Mark

On 2014-11-03 11:58 AM, Mark Côté wrote:
> Well, I think it's still a good idea to tag when releases are made.
> 
> 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).
> 
> Mark
> 
> 
> On 2014-11-03 11:51 AM, Randall S. Becker wrote:
>> Sorry about the confusion. The title, you know.
>>
>> Otherwise, makes sense, Gerv. I don't know that there is a good reason to
>> have a Tag in that case. Your -stable branch appears to do what is needed
>> for it, and the Tag is a bit redundant.
>>
>> -----Original Message-----
>> From: developers-owner at bugzilla.org [mailto:developers-owner at bugzilla.org]
>> On Behalf Of Gervase Markham
>> Sent: November 3, 2014 11:44 AM
>> To: dev-apps-bugzilla at lists.mozilla.org
>> Subject: Re: How we use Git
>>
>> Hi Randall,
>>
>> I think there's a wire crossed here. We are looking for the git commands for
>> administrators to use to obtain a copy of Bugzilla for their server, and
>> perhaps upgrade it. Developers would use different commands.
>>
>> On 03/11/14 16:25, Randall S. Becker wrote:
>>> The git implication is that the release-X.X-stable branch is where 
>>> development/fixes would be done in an accumulating fashion.
>>
>> No - that's the branch simply called "X.X". The release-X.X-stable branch
>> would stick at the point where the last release was made, and then jump
>> forward to the next release point all in one go. This would mean that people
>> tracking it would have the exact code which went into one of our point
>> releases, rather than some hybrid in between.
>>
>> So developers would use the "X.X" branch, and admins would use the
>> "release-X.X-stable" branch.
>>
>> Gerv
>> _______________________________________________
>> dev-apps-bugzilla mailing list
>> dev-apps-bugzilla at lists.mozilla.org
>> https://lists.mozilla.org/listinfo/dev-apps-bugzilla
>> -
>> To view or change your list settings, click here:
>> <http://bugzilla.org/cgi-bin/mj_wwwusr?user=rsbecker@nexbridge.com>
>>
>> -
>> To view or change your list settings, click here:
>> <http://bugzilla.org/cgi-bin/mj_wwwusr?user=dev-apps-bugzilla@lists.mozilla.org>
>>
> 

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