[core-workflow] instructions for cherrypicking a change from master

Nick Coghlan ncoghlan at gmail.com
Thu Oct 6 23:10:26 EDT 2016


On 7 October 2016 at 12:28, Chris Angelico <rosuav at gmail.com> wrote:
> git checkout master
> git cherry-pick footnote
> git show
>
> Check out the branch you want to cherry-pick into.
> $ git checkout 3.6
> Grab the commit you want
> $ git cherry-pick -x 142a57
> Make sure it looks good, and then push.

That note about "make sure it looks good" reminded me that "make
patchcheck" is going to need updating to handle git, which means
updating Tools/scripts/patchcheck.py

Brett, how would you like that extra task captured - PR to PEP 512?

Cheers,
Nick.

-- 
Nick Coghlan   |   ncoghlan at gmail.com   |   Brisbane, Australia


More information about the core-workflow mailing list