How we use Git

[Gervase Markham]

On 03/11/14 14:53, Mark Côté wrote:
> Not a bad idea at all; however, I would want to make them technically
> branches, not tags, since tags are supposed to be unmovable (we should
> be doing this with bugzilla-stable as well, but I'm not sure how, since
> it jumps from branch to branch).  But you don't have to think of them as
> branches, since they won't diverge from the parent branch.  It will
> avoid having to do a "push -f", which we need to do with bugzilla-stable
> right now, but which we should actually never ever never do.

Yes, that sounds like a good idea.

Do we actually want a bugzilla-stable branch/tag? Given the risks of
accidentally moving from e.g. 4.2 to 4.4 by using it, why would anyone
ever want to track it?

I think we should only have "bugzilla-X.X-stable" branches, and if
someone wants to upgrade further than a point release, they have to
actively take the steps to move branch (git checkout etc.) rather than
just a git pull.

So the workflows would then be:

Initial installation:

git clone http://git.mozilla.org/bugzilla/bugzilla.git
cd bugzilla
git checkout bugzilla-4.2-stable

Upgrade to latest 4.2 release at any time:

git pull

Upgrade to 4.4:

git pull
git checkout bugzilla-4.4-stable

That all seems nice and simple to me.

Gerv

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