[Numpy-discussion] proposal: new commit guidelines for backportable bugfixes

Ralf Gommers ralf.gommers at gmail.com
Sat Jul 19 07:04:17 EDT 2014


On Sat, Jul 19, 2014 at 12:29 PM, Pauli Virtanen <pav at iki.fi> wrote:

> 19.07.2014 11:04, Ralf Gommers kirjoitti:
> [clip]
> >   1. bugfix PR sent to master by contributor
> >   2. maintainer decides it's backportable, so after review he doesn't
> merge
> > PR but rebases it and sends a second PR. First one, with review content,
> is
> > closed not merged.
> >   3. merge PR into maintenance branch.
> >   4. send third PR to merge back or forward port the fix to master, and
> > merge that.
> > (or some variation with merge bases which is even more involved)
>
> The maintainer can just rebase on merge base, and then merge and push it
> via git as usual, without having to deal with Github.


I agree, but note that that's not what's happening in the numpy repo at the
moment and that Julian (and maybe Chuck as well?) is explicitly against any
direct pushes. So the 3x more PRs between what the process used to be and
what Julian proposes is not unrealistic.

Maybe still worth it, but it's a trade-off (example: I used to use "gitk
--all", but it's a spaghetti now).

Ralf



> If the pull
> request happens to be already based on an OK merge base, it can be
> merged via Github directly to master.
>
> The only thing maintainer gains from sending additional pull request via
> Github is that the code gets run by Travis-CI. However, the tests will
> also run automatically after pushing the merge commits, so test failures
> can be caught (although after the fact). This is also the case for
> directly pushed cherry-picked commits.
>
> --
> Pauli Virtanen
>
> _______________________________________________
> NumPy-Discussion mailing list
> NumPy-Discussion at scipy.org
> http://mail.scipy.org/mailman/listinfo/numpy-discussion
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/numpy-discussion/attachments/20140719/ed526ecd/attachment.html>


More information about the NumPy-Discussion mailing list