[Matplotlib-devel] Comments on backports

Thomas Caswell tcaswell at gmail.com
Mon Feb 29 09:36:01 EST 2016


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

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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/matplotlib-devel/attachments/20160229/89abcb67/attachment.html>


More information about the Matplotlib-devel mailing list