Skip to content

/ devguide

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.

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

Jump to bottom

Update the section about backporting changes #173

Closed
Mariatta opened this issue Apr 21, 2017 · 1 comment
Closed

Update the section about backporting changes #173

Mariatta opened this issue Apr 21, 2017 · 1 comment

Comments

@Mariatta
Copy link
Member

@Mariatta Mariatta commented Apr 21, 2017

The section:
http://cpython-devguide.readthedocs.io/committing.html?highlight=backport#backporting-changes-to-python-3-6-or-older-version
has instructions on how to apply a patch to master, which is not desirable in the current workflow. We should be working on branches other than master.

I think this should be updated somehow. Maybe also consider merging it with the next section http://cpython-devguide.readthedocs.io/committing.html?highlight=backport#backport-and-cherry-pick-labels
@ncoghlan
Copy link
Contributor

@ncoghlan ncoghlan commented Apr 22, 2017

I'd suggest updating it to show using git log -10 --oneline to get a list of the recent commit hashes and the first line of their commit messages.
@Mariatta Mariatta mentioned this issue Apr 25, 2017
Merged
Mariatta added a commit that referenced this issue Apr 25, 2017
@Mariatta
Update backport instructions
Loading status checks…
f73f95c 
Remove the part about merging into master.
Remove the part about prefixing the PR title with `X.Y`, cherry_picker.py already does this.

Closes #173
@Mariatta Mariatta mentioned this issue Apr 25, 2017
Merged
willingc added a commit that referenced this issue Apr 25, 2017
@Mariatta @willingc
Update backport instructions (#178)
8f44690 
* Update backport instructions

Remove the part about merging into master.
Remove the part about prefixing the PR title with `X.Y`, cherry_picker.py already does this.

Closes #173

* hash -> hashes

* add `an`
@Mariatta Mariatta mentioned this issue Mar 6, 2019
Open
0 of 3 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked pull requests

Successfully merging a pull request may close this issue.

Update backport instructions
2 participants
@ncoghlan @Mariatta
You can’t perform that action at this time.