[Matplotlib-devel] Comments on backports

[Matthias Bussonnier]

Hey Thomas, 
> On Feb 29, 2016, at 06:36, Thomas Caswell <tcaswell at gmail.com> wrote:
> 
> Folks,
> 
> When doing backports please include the branch you backported the commit to  (I have run across several places where I have _not_ done this and it is a bit annoying to sort out after the fact).
> 
> A quick guide to how to backport (which should go in the docs):
> 
>   git remote update
>   git checkout target_branch
>   git merge --ff-only matplotlib/target_branch
>   git cherry-pick -m TARGET_SHA
>   gitk   # to look at it
>   # local tests? (use your judgement)
>   git push DANGER target_branch
>   # leave a comment on PR noting sha of the resulting commit 
>   # from the cherry-pick + branch it was moved to

We have an IPython script (that can need some love) that can help with that:

https://github.com/ipython/ipython/blob/master/tools/backport_pr.py <https://github.com/ipython/ipython/blob/master/tools/backport_pr.py>

It should be able to auto guess which PR to merge based on milestone, if that can be of help.

-- 
M

> 
> here matplotlib is a read-only remote to the matplotlib/matplotlib repo and DANGER in a read/write remote to the matplotlib/matplotlib repo.
> 
> These commands work on git 2.7.1.
> 
> Tom
> _______________________________________________
> Matplotlib-devel mailing list
> Matplotlib-devel at python.org
> https://mail.python.org/mailman/listinfo/matplotlib-devel

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/matplotlib-devel/attachments/20160229/21e0deec/attachment.html>