Skip to content

Clarify that backport PR needs to include GH- from master #392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2018
Merged

Clarify that backport PR needs to include GH- from master #392

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions committing.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,11 @@ When it is determined that a pull request needs to be backported into one or
more of the maintenance branches, a core developer can apply the labels
``needs backport to X.Y`` to the pull request.

After the pull request has been merged, miss-islington (bot) will first try to do the backport automatically. In case that miss-islington is unable to do it, then the pull request author or the core developer who merged it should look into backporting it themselves, using the backport generated by cherry_picker.py_ as a starting point.
After the pull request has been merged, miss-islington (bot) will first try to
do the backport automatically. In case that miss-islington is unable to do it,
then the pull request author or the core developer who merged it should look into
backporting it themselves, using the backport generated by cherry_picker.py_
as a starting point.

The commit hash can be obtained from the original pull request, or by using
``git log`` on the ``master`` branch.
Expand All @@ -256,9 +260,12 @@ message::

git log -10 --oneline

Prefix the backport pull request with the branch, for example::
.. _backport-pr-title:

[3.7] bpo-12345: Fix the Spam Module
Prefix the backport pull request with the branch, and reference the pull request
number from ``master``, for example::

[3.7] bpo-12345: Fix the Spam Module (GH-NNNN)

Note that cherry_picker.py_ adds the branch prefix automatically.

Expand Down