How we use Git

[Mark Côté]

On 2014-11-03 10:15 AM, Gervase Markham wrote:
> 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.

A very good point.  I'm up for removing bugzilla-stable.  And in keeping
with the other thread, we should probably name these "release-X.X-stable".

> 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

or just

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

> Upgrade to latest 4.2 release at any time:
> 
> git pull
> 
> Upgrade to 4.4:
> 
> git pull
> git checkout bugzilla-4.4-stable

Technically in the upgrade case you just need to do

git fetch
git checkout bugzilla-4.4-stable

"pull" does a "fetch" but also also merges in changes to your current
branch, which you don't need if you'll be switching branches.

> That all seems nice and simple to me.

It sure does! :)

Mark

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