Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Support version retrieval from custom branches #253

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 6 commits into from
Jun 9, 2018
+45 −8
Merged

Support version retrieval from custom branches #253

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fb8b84c
Support version retrieval from custom branches
webknjaz May 23, 2018
115d616
Parametrize test for custom named branches
webknjaz May 23, 2018
f53858d
Add negative tests for branch sorter
webknjaz May 23, 2018
ff86b9f
Ignore pytest's cache dir
webknjaz May 23, 2018
3209061
Document new matching branch names
webknjaz Jun 9, 2018
1bac4b7
Update readme.rst
Mariatta Jun 9, 2018
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
Prev Previous commit
Next Next commit
Document new matching branch names
  • Loading branch information
@webknjaz
webknjaz committed Jun 9, 2018
commit 32090619a052e6244b60bb0531a32f1f96207fd9
16 changes: 13 additions & 3 deletions cherry_picker/readme.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,14 @@ Usage (from a cloned CPython directory) ::
About
=====

Use this to backport CPython changes from ``master`` into one or more of the
maintenance branches (``3.6``, ``3.5``, ``2.7``).
Use this to backport changes from the main branch of your project into one or
more of the maintenance branches (``3.6``, ``3.5``, ``2.7``, ``stable-2.6``,
``2.5-lts``).
The main requirement is that the target branches should contain some sort of
version number, which is at least two numbers separated by a dot.

This tool is used to backport CPython changes from ``master`` into one or more
of the maintenance branches (``3.6``, ``3.5``, ``2.7``).

It will prefix the commit message with the branch, e.g. ``[3.6]``, and then
opens up the pull request page.
Expand Down Expand Up @@ -142,8 +148,12 @@ To customize the tool for used by other project:
by ``pip install cherry_picker``

5. Now everything is ready, use ``cherry_picker <commit_sha> <branch1>
<branch2>`` for cherry-picking changes from ``<commit_sha`` into
<branch2>`` for cherry-picking changes from ``<commit_sha>`` into
maintenance branches.
Branch name should contain at least major and minor version numbers
and may have some prefix or suffix.
Only the first version-like substring is matched when the version
is extracted from branch name.

Demo
----
Expand Down