Re: How do Bugzilla installs use git?

comments inline

On Tue, Oct 7, 2014 at 6:37 AM, Gervase Markham <[email protected]> wrote:
>
>
> 2) Update to a new point release (e.g. a security release), merging in
>    changes they've made
>

If you release patches (actual .patch files), you can prepare those with
git-format-patch.
Then store them online somewhere. People can apply them with git-am in bulk
or individually with git-apply.

https://www.kernel.org/pub/software/scm/git/docs/git-format-patch.html
https://www.kernel.org/pub/software/scm/git/docs/git-apply.html
https://www.kernel.org/pub/software/scm/git/docs/git-am.html

If people are familiar with git, they can do merge / rebase operations.


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

git has a reflog, so unless you run destructive operations like git-prune
or git-gc, this is your safety net.

https://www.kernel.org/pub/software/scm/git/docs/git-reflog.html


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

NO! NO! NO! git pull is dangerous. git-pull does a git-fetch followed by
git-merge.

please instruct people to use git-fetch instead.
Then ask them to explicitly choose a git-merge or git-rebase operation
manually.
Please have admins take the driver seat and choose either based on their
requirements.

https://www.kernel.org/pub/software/scm/git/docs/git-fetch.html
https://www.kernel.org/pub/software/scm/git/docs/git-pull.html
https://www.kernel.org/pub/software/scm/git/docs/git-merge.html
https://www.kernel.org/pub/software/scm/git/docs/git-rebase.html

most operations have an --abort.
e.g. overwhelming merge conflicts while doing rebase? => git rebase --abort.

if you messed up so bad you can't cancel, you still have the reflog.
https://www.kernel.org/pub/software/scm/git/docs/git-reflog.html


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

no pull please.


>
> 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=damien.nozay-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>
_______________________________________________
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>