From 97cc0cce7f53b704f8541530e42d5e515584cd95 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Thu, 12 Jul 2018 19:34:02 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=B8=20=F0=9F=90=8D=20=F0=9F=8D=92=20?= =?UTF-8?q?=E2=9B=8F=20Integrate=20cherry=20picker=20(#41403)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .cherry_picker.toml | 5 +++++ docs/docsite/rst/community/development_process.rst | 7 +++++++ 2 files changed, 12 insertions(+) create mode 100644 .cherry_picker.toml diff --git a/.cherry_picker.toml b/.cherry_picker.toml new file mode 100644 index 00000000000..9a128daedfb --- /dev/null +++ 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 index 9cebe5fe63e..9d85ee00df7 100644 --- 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 `_ for + details on installing, configuring, and using it. + Ansibullbot ===========