<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Hey Thomas, <br class=""><div><blockquote type="cite" class=""><div class="">On Feb 29, 2016, at 06:36, Thomas Caswell <<a href="mailto:tcaswell@gmail.com" class="">tcaswell@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">Folks,<div class=""><br class=""></div><div class="">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).</div><div class=""><br class=""></div><div class="">A quick guide to how to backport (which should go in the docs):</div><div class=""><br class=""></div><div class=""> git remote update</div><div class=""> git checkout target_branch</div><div class=""> git merge --ff-only matplotlib/target_branch</div><div class=""> git cherry-pick -m TARGET_SHA</div><div class=""> gitk # to look at it</div><div class=""> # local tests? (use your judgement)</div><div class=""> git push DANGER target_branch</div><div class=""> # leave a comment on PR noting sha of the resulting commit </div><div class=""> # from the cherry-pick + branch it was moved to</div></div></div></blockquote><div><br class=""></div><div>We have an IPython script (that can need some love) that can help with that:</div><div><br class=""></div><div><a href="https://github.com/ipython/ipython/blob/master/tools/backport_pr.py" class="">https://github.com/ipython/ipython/blob/master/tools/backport_pr.py</a></div><div><br class=""></div><div>It should be able to auto guess which PR to merge based on milestone, if that can be of help.</div><div><br class=""></div><div>-- </div><div>M</div><br class=""><blockquote type="cite" class=""><div class=""><div dir="ltr" class=""><div class=""><br class=""></div><div class="">here matplotlib is a read-only remote to the matplotlib/matplotlib repo and DANGER in a read/write remote to the matplotlib/matplotlib repo.</div><div class=""><br class=""></div><div class="">These commands work on git 2.7.1.</div><div class=""><br class=""></div><div class="">Tom</div></div>
_______________________________________________<br class="">Matplotlib-devel mailing list<br class=""><a href="mailto:Matplotlib-devel@python.org" class="">Matplotlib-devel@python.org</a><br class="">https://mail.python.org/mailman/listinfo/matplotlib-devel<br class=""></div></blockquote></div><br class=""></body></html>