diff --git a/cherry_picker/cherry_picker/__init__.py b/cherry_picker/cherry_picker/__init__.py index ebaaf09..81dd191 100644 --- a/cherry_picker/cherry_picker/__init__.py +++ b/cherry_picker/cherry_picker/__init__.py @@ -1,2 +1,2 @@ """Backport CPython changes from master to maintenance branches.""" -__version__ = '1.1.2.dev1' +__version__ = '1.2.0.dev1' diff --git a/cherry_picker/readme.rst b/cherry_picker/readme.rst index ae5ccb6..86337b7 100644 --- a/cherry_picker/readme.rst +++ b/cherry_picker/readme.rst @@ -339,9 +339,19 @@ in the directory where ``pyproject.toml`` exists:: Changelog ========= -1.1.2 (in development) +1.2.0 (in development) ---------------------- +- Add ``default_branch`` configuration item. The default is ``master``, which + is the default branch for CPython. It can be configured to other branches like, + ``devel``, or ``develop``. The default branch is the branch cherry_picker + will return to after backporting. (`PR #254 `_ + and `Issue #250 `_). + +- Support additional branch versioning schemes, such as ``something-X.Y``, + or ``X.Y-somethingelse``. (`PR #253 `_ + and `Issue #251 `_). + 1.1.1 -----