How we use Git

[Gervase Markham]

On 03/11/14 14:13, Mark Côté wrote:
> It's the same procedure we did with bzr, no?  

Yes, indeed. I just hadn't twigged that Git had tags and that we were
still using them. <shrug> For some reason, I expected to see them listed
with "git branch".

> It's also a very common
> practice.  That said, if it's not documented anywhere, I agree that it
> should be.

Well, it's because I'm writing the docs that I asked! :-) But it seems
to be documented on the wiki.

> 1. The name of the release is 4.4, not 4.4.0.

That would be a reason to tag as 4.4.0 in addition, rather than instead
of, 4.4.

> 2. bugzilla-4.4 is a tag, whereas 4.4 is a branch.  

That is true. However, it seems from previous conversations that git
uses git checkout --branch to pull both. I'm just saying it may not be
obvious to a new Bugzilla admin that:

git checkout --branch bugzilla-4.4

gives you the checkout of a tag, which doesn't move, but:

git checkout --branch 4.4

gives you a branch, which does.

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

I'm not arguing we should change our plan about what's a branch and
what's a tag, or change our general development practice.

It's not a big deal, though.

Gerv

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