On 8/13/2020 4:56 PM, Mariatta wrote:
when landed remove the
"need backport tags" you added...
If done correctly, the "needs backport .." labels got removed
automatically. We have detailed info here:
https://devguide.python.org/committing/#backporting-changes-to-an-older-version
The backport bot occasionally fails, sometimes for external reasons. If
you hit a problem, you can ask me for help as I have probably hit all
the failure modes by now.
a) is it ok to touch 3.9, as it's in rc1?
Yeah bug fixes are accepted to the maintenance branches. I think your PR
does count as documentation bug fix, so it should be ok to backport to 3.9
Release candidates are done from a separate release branch. I believe
that commits now to 3.9 will only appears in 3.9.0rc2 (or 3.9.0) if the
release manager cherry-picks them into the 3.9.0 release branch.
Otherwise, 3.9.1. Doc fixes usually appear online within a day, so that
pulling them into the release branch should only affects the frozen
offline copy.
b) shall I create two brand new branches for those PRs, or there's
some way in github/git to "just propose this same change to the other
branches"?
In most cases the bot can handle it simply by adding the "needs backport
" label. But for more complicated situations, please use the
cherry_picker.py command line tool.
The documentation on how to do it is here:
https://github.com/python/cherry-picker#cherry-picking
AFAIK, every PRs is done from its own branch. Backports are done on
usually shortlived branches. Cherry-picker names them
backport-XXXXXXX-3.x, where XXXXXXX is the first 7 hex digits of the
commit and 'x' is the target version. But that has no significance to
github.
--
Terry Jan Reedy
_______________________________________________
Python-Dev mailing list -- python-dev@python.org
To unsubscribe send an email to python-dev-le...@python.org
https://mail.python.org/mailman3/lists/python-dev.python.org/
Message archived at
https://mail.python.org/archives/list/python-dev@python.org/message/B52253RAXOI3AV24TI7BPM76WXYBK3NQ/
Code of Conduct: http://python.org/psf/codeofconduct/
