Skip to content

cherry-pick from the newest branch #59

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
Mariatta merged 2 commits into from
Mar 23, 2017
Merged

cherry-pick from the newest branch #59

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82872dd
cherry-pick from the newest branch
Mariatta Mar 23, 2017
1e7b711
Add pytest to requirements.txt
Mariatta Mar 23, 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
Next Next commit
cherry-pick from the newest branch
  • Loading branch information
@Mariatta
Mariatta committed Mar 23, 2017
commit 82872dd36f4e978b836f440919e6a93ab786ab57
2 changes: 1 addition & 1 deletion cherry_picker/cherry_picker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def cherry_pick(dry_run, pr_remote, commit_sha1, branches):
if not branches:
raise ValueError("at least one branch is required")

for branch in branches:
for branch in sorted(branches, reverse=True):

@ncoghlan ncoghlan Mar 23, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will already do the right thing for X.Y branches, but do we want to future-proof it against the day of 3.10 by adding key=lambda v: tuple(map(int, v.split('.')))?

click.echo(f"Now backporting '{commit_sha1}' into '{branch}'")

# git checkout -b 61e2bc7-3.5 upstream/3.5
Expand Down