How we use Git

[Mark Côté]

On 2014-11-03 8:45 AM, Gervase Markham wrote:
> On 31/10/14 18:29, Mark Côté wrote:
>> Almost.  You would do up to 'cd bugzilla', then
>>
>> git checkout bugzilla-4.4.6
>>
>> 'bugzilla-4.4.6' is a tag on the last commit included in the release.
>> We create similar tags for all releases.
> 
> You see, I did not know that. That is important information :-)

It's the same procedure we did with bzr, no?  It's also a very common
practice.  That said, if it's not documented anywhere, I agree that it
should be.

> How about this for a suggestion? We currently tag the first in the "4.4"
> series as "bugzilla-4.4". Would it be better to tag it as
> "bugzilla-4.4.0", either instead or additionally? That would make
> instructions on how to pull a particular version easier to write,
> because you wouldn't need to special-case the first release.
> 
> You see, it's not immediately clear to an observer if
> git checkout bugzilla-4.4
> is pulling the latest 4.4 or the original release of 4.4.

I would counter for two reasons:

1. The name of the release is 4.4, not 4.4.0.  I would argue that it's
more confusing that, to find 4.4's release, you have to look for
bugzilla-4.4.0, that is, unless we want to change how we name the
initial release of a new version.

2. bugzilla-4.4 is a tag, whereas 4.4 is a branch.  Across many VCSes,
not just git, tags are used to indicate snapshots, often releases, and
branches are where development specific to a base release (e.g. 4.4.*)
occurs.  This is again roughly how we used bzr.  If you ever want the
latest of anything, you go to the head of the branch.  It's the same for
master as it is for any release branch.

Mark



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