8000 Clarify backports documentation by story645 · Pull Request #7981 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Clarify backports documentation #7981

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 2 commits into from
Feb 6, 2017
Merged

Clarify backports documentation #7981

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66f8c26
Clarifying backports documentation
story645 Jan 29, 2017
49a14f3
Update coding_guide.rst
story645 Jan 30, 2017
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
17 changes: 10 additions & 7 deletions doc/devel/coding_guide.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,20 +91,23 @@ Backports
When doing backports please include the branch you backported the
commit to along with the SHA in a comment on the original PR.

Assuming we have ``matplotlib`` as a read-only remote to the
matplotlib/matplotlib repo and ``DANGER`` as a read/write remote to
the matplotlib/matplotlib repo, we do a backport from master to 2.x.
We do a backport from master to v2.0.x assuming:

* ``matplotlib`` is a read-only remote branch of the matplotlib/matplotlib repo

* ``DANGER`` is a read/write remote branch of the matplotlib/matplotlib repo

The ``TARGET_SHA`` is the hash of the merge commit you would like to
backport. This can be read off of the github PR page (in the UI with
the merge notification) or through the git CLI tools.::

git fetch matplotlib
git checkout v2.x
git merge --ff-only matplotlib/v2.x
git checkout v2.0.x
git merge --ff-only matplotlib/v2.0.x
git cherry-pick -m 1 TARGET_SHA
gitk # to look at it
git log --graph --decorate # to look at it
# local tests? (use your judgment)
git push DANGER v2.x
git push DANGER v2.0.x
# leave a comment on PR noting sha of the resulting commit
# from the cherry-pick + branch it was moved to

Expand Down
0