<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Oct 7, 2016 at 4:28 AM, Chris Angelico <span dir="ltr"><<a href="mailto:rosuav@gmail.com" target="_blank">rosuav@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><span class="gmail-">On Fri, Oct 7, 2016 at 1:26 PM, Nick Coghlan <<a href="mailto:ncoghlan@gmail.com">ncoghlan@gmail.com</a>> wrote:<br>
> On 7 October 2016 at 11:55, Chris Angelico <<a href="mailto:rosuav@gmail.com">rosuav@gmail.com</a>> wrote:<br>
>> If you want to, you can 'git cherry-pick -x 142a57', which will add a<br>
>> linking comment to the commit that it creates, saying where it came<br>
>> from.<br>
><br>
> Recommending the use of referenced cherry picks sounds like a good idea to me.<br>
><br>
> It may also be worth linking to<br>
> <a href="https://www.python.org/dev/peps/pep-0512/#commit-multi-release-changes-in-bugfix-branch-first" rel="noreferrer" target="_blank">https://www.python.org/dev/<wbr>peps/pep-0512/#commit-multi-<wbr>release-changes-in-bugfix-<wbr>branch-first</a><br>
> from this section of the devguide to help explain why we recommend<br>
> using the "work on master, cherry pick to maintenance branches"<br>
> approach.<br>
<br>
</span>git checkout master<br>
git cherry-pick footnote<br>
git show<br>
<span class="gmail-"><br>
Check out the branch you want to cherry-pick into.<br>
$ git checkout 3.6<br>
Grab the commit you want<br>
</span>$ git cherry-pick -x 142a57<br>
<span class="gmail-">Make sure it looks good, and then push.<br></span></blockquote><div><br></div><div>There's one nit with that cherry-pick, it already creates the commit, and current<br></div><div>description states you should create a commit after running tests [1]. Although <br>in my update [2] I decided to go with automatic commit, to leverage -x option.<br><br>[1] <a href="http://cpython-devguide.readthedocs.io/en/github/committing.html#merging-between-different-branches-within-the-same-major-version">http://cpython-devguide.readthedocs.io/en/github/committing.html#merging-between-different-branches-within-the-same-major-version</a><br>[2] <a href="https://github.com/python/devguide/pull/57">https://github.com/python/devguide/pull/57</a><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><span class="gmail-">
<br>
</span>:)<br>
<br>
ChrisA<br>
<div class="gmail-HOEnZb"><div class="gmail-h5">______________________________<wbr>_________________<br>
core-workflow mailing list<br>
<a href="mailto:core-workflow@python.org">core-workflow@python.org</a><br>
<a href="https://mail.python.org/mailman/listinfo/core-workflow" rel="noreferrer" target="_blank">https://mail.python.org/<wbr>mailman/listinfo/core-workflow</a><br>
This list is governed by the PSF Code of Conduct: <a href="https://www.python.org/psf/codeofconduct" rel="noreferrer" target="_blank">https://www.python.org/psf/<wbr>codeofconduct</a><br>
</div></div></blockquote></div><br></div></div>