Skip to content

Document backport and cherry-pick labels #126

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

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

Document backport and cherry-pick labels #126

Mariatta opened this issue Feb 21, 2017 · 1 comment

Comments

@Mariatta
Copy link
Member

There should be a documentation explaining what to do with the labels needs backport to X.Y and cherry-pick for X.Y. Perhaps as a new section in committing.rst?

I think this is the current workflow: (as discussed in python/core-workflow#23)

  • Apply needs backport to X.Y label to the PR against master.
  • Once master PR is approved and merged, create the cherry-pick PR.
  • Remove needs backport to X.Y label from master PR
  • Apply the cherry-pick for X.Y to the cherry-pick PR.
  • Prefix the cherry-pick pr description with [X.Y]
  • Issue can be closed once all cherry-pick PRs have been merged.

Where X.Y is one of the maintenance branches, e.g. 2.7, 3.5, 3.6

Related question: Can I assume that the core developer who merged the master PR will do the backport?

Thanks :)

@berkerpeksag
Copy link
Member

+1 from me. We probably need to wait for a bit to settle on the exact workflow before starting to document it.

We could probably cover the GitHub part in http://cpython-devguide.readthedocs.io/committing.html#backporting-changes-to-python-3-6-or-older-version (or split it to two separate subsections?)

Related question: Can I assume that the core developer who merged the master PR will do the backport?

+1. This is also my assumption.

Mariatta added a commit that referenced this issue Mar 17, 2017
- reference the Git bootcamp page
- recommend cherry_picker.py
- explain backport/cherry-pick labels

Closes #126
Mariatta added a commit that referenced this issue Mar 17, 2017
- reference the Git bootcamp page
- recommend cherry_picker.py
- explain backport/cherry-pick labels

Closes #126
AA-Turner pushed a commit to AA-Turner/devguide that referenced this issue Jun 17, 2022
- reference the Git bootcamp page
- recommend cherry_picker.py
- explain backport/cherry-pick labels

Closes python#126
kitarefake added a commit to kitarefake/devguide that referenced this issue Jul 15, 2024
- reference the Git bootcamp page
- recommend cherry_picker.py
- explain backport/cherry-pick labels

Closes python/devguide#126
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants