🚸 🐍 🍒 ⛏ 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
pyfontan · Jul 12, 2018 · 97cc0cc · 97cc0cc
1 parent 7c97bb5
commit 97cc0cc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/.cherry_picker.toml b/.cherry_picker.toml
@@ -0,0 +1,5 @@
+team = "ansible"
+repo = "ansible"
+check_sha = "f31421576b00f0b167cdbe61217c31c21a41ac02"  # the very first commit in repo
+fix_commit_msg = false  # Don't replace "#" with "GH-"
+default_branch = "devel"
diff --git a/docs/docsite/rst/community/development_process.rst b/docs/docsite/rst/community/development_process.rst
@@ -82,6 +82,13 @@ pull request to backport the change to a previous stable branch.
     but it can be helpful, especially when making multiple backport PRs for
     multiple stable branches.
 
+.. note::
+
+    If you prefer, you can use CPython's cherry-picker tool to backport commits
+    from devel to stable branches in Ansible. Take a look at the `cherry-picker
+    documentation <https://pypi.org/p/cherry-picker#cherry-picking>`_ for
+    details on installing, configuring, and using it.
+
 
 Ansibullbot
 ===========