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

[Maciej Szulik]

On Fri, Oct 7, 2016 at 11:37 PM, Chris Angelico <rosuav at gmail.com> wrote:

> On Sat, Oct 8, 2016 at 8:31 AM, Maciej Szulik <soltysh at gmail.com> wrote:
> > There's one nit with that cherry-pick, it already creates the commit, and
> > current
> > description states you should create a commit after running tests [1].
> >
> > [1]
> > http://cpython-devguide.readthedocs.io/en/github/
> committing.html#merging-between-different-branches-
> within-the-same-major-version
>
> Not sure that that need be a problem. You've already run the tests on
> the other branch, presumably, so the chances of a test failure are
> low; most of the time, it'll be "cherry-pick, test, push", and very
> occasionally, it'll be "cherry-pick, test, oops failures, reset or
> amend". As long as you don't push, there's nothing permanent in the
> commit.
>

Totally agree, that's why I went with that change and left the history
behind.
But run tests is still required :)


>
> ChrisA
> _______________________________________________
> core-workflow mailing list
> core-workflow at python.org
> https://mail.python.org/mailman/listinfo/core-workflow
> This list is governed by the PSF Code of Conduct:
> https://www.python.org/psf/codeofconduct
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/core-workflow/attachments/20161008/632e7d1b/attachment-0001.html>