How do Bugzilla installs use git?

Come 5.0, we plan to update our docs to tell installations to use git to
get the code. However, I'm not entirely clear on how exactly that works.
Maybe I'm the only one; if so, clue me in :-)

It seems to me that there are 3 operations a site would need to do:

1) Get the code initially (and perhaps then say which version they
wanted to run)

2) Update to a new point release (e.g. a security release), merging in
   changes they've made

3) Update to a later version, merging in changes they've made

It would be good if 2) and 3) had a dry-run option.

What git commands do we use for these things?

Here's my guesses:

1)
git clone https://git.mozilla.org/bugzilla/bugzilla <target dir>
cd <target dir>
git checkout <branch name>

Open questions:
a) Will this lead them to have an intermediate version, say if the
branch name is "4.4", 4.4.2 is stable and we are in the middle of
putting together 4.4.3? Do we need a "4.4-stable" branch and equivalents
that people can check out? Or do we do the assembly on a branch and
merge back in only at the end?

2)
git pull

Open questions:
b) Do we need git pull <branch name> instead, or is this OK?

3)
git pull
git checkout <new branch name>

For reference, our list of current branches and tags is here:
http://git.mozilla.org/?p=bugzilla/bugzilla.git

Is this all correct?

Gerv
_______________________________________________
dev-apps-bugzilla mailing list
dev-apps-bugzilla-CzyLcWPZiU5YsZ3hbOqMTti2O/[email protected]
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=gcbd-developers-Uylq5CNFT+jYtjvyW6yDsg@public.gmane.org>