Skip to content

Commit 97cc0cc

Browse files
authoredJul 12, 2018
🚸 🐍 πŸ’ ⛏ Integrate cherry picker (ansible#41403)
This enables developers to use cherry-picker for backporting purposes. This tool originally comes from Core Python Development Workflow. Ref: https://pypi.org/p/cherry-picker Ref: https://github.com/python/core-workflow/tree/master/cherry_picker Also: * πŸ“ Add docs about supporting cherry-picker
1 parent 7c97bb5 commit 97cc0cc

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed
 

β€Ž.cherry_picker.toml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
team = "ansible"
2+
repo = "ansible"
3+
check_sha = "f31421576b00f0b167cdbe61217c31c21a41ac02" # the very first commit in repo
4+
fix_commit_msg = false # Don't replace "#" with "GH-"
5+
default_branch = "devel"

β€Ždocs/docsite/rst/community/development_process.rst

+7
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,13 @@ pull request to backport the change to a previous stable branch.
8282
but it can be helpful, especially when making multiple backport PRs for
8383
multiple stable branches.
8484

85+
.. note::
86+
87+
If you prefer, you can use CPython's cherry-picker tool to backport commits
88+
from devel to stable branches in Ansible. Take a look at the `cherry-picker
89+
documentation <https://pypi.org/p/cherry-picker#cherry-picking>`_ for
90+
details on installing, configuring, and using it.
91+
8592

8693
Ansibullbot
8794
===========

0 commit comments

Comments
 (0)