This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 49c60677dbd Add copy-pasteable cherry-picker command if it fails to
cherry-pick (#44316)
49c60677dbd is described below
commit 49c60677dbd6e7203b1640f42525a6f80b8e5184
Author: Jarek Potiuk <[email protected]>
AuthorDate: Sun Nov 24 01:10:44 2024 +0000
Add copy-pasteable cherry-picker command if it fails to cherry-pick (#44316)
When cherry-picker fails to backport a PR it adds a message to
the PR explaining the failure and linking to the commit. This PR
also adds a copy&pasteable cherry-picker command that the maintainer
should run to retry it locally. It also explains what
maintainer should do after solving the conflicts.
---
dev/backport/update_backport_status.py | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/dev/backport/update_backport_status.py
b/dev/backport/update_backport_status.py
index e6e3ce064ce..a0354e07ac4 100644
--- a/dev/backport/update_backport_status.py
+++ b/dev/backport/update_backport_status.py
@@ -52,7 +52,23 @@ def get_failure_comment(branch: str, commit_sha_url: str,
commit_sha: str):
<td>{branch}</td>
<td><a href="{commit_sha_url}"><img src='{commit_shield_url}'
alt='Commit Link'></a></td>
</tr>
- </table>"""
+ </table>
+
+ You can attempt to backport this manually by running:
+
+ ```bash
+ cherry_picker {commit_sha[:7]} {branch}
+ ```
+
+ This should apply the commit to the {branch} branch and leave the
commit in conflict state marking
+ the files that need manual conflict resolution.
+
+ After you have resolved the conflicts, you can continue the backport
process by running:
+
+ ```bash
+ cherry_picker --continue
+ ```
+"""
return comment
