uros-b commented on code in PR #57959:
URL: https://github.com/apache/spark/pull/57959#discussion_r3772784128
##########
dev/merge_spark_pr.py:
##########
@@ -637,7 +650,9 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc,
pr_author, co_author
def _do_cherry_pick(pr_num, merge_hash, pick_ref):
"""Cherry-pick `merge_hash` onto `pick_ref` and push.
- Returns the (pushed ref, pushed commit hash) pair.
+ Returns the (pushed ref, pushed commit hash) pair. Raises `SkipCherryPick`
if the
+ cherry-pick conflicts and the committer declines to resolve it, having
first aborted
Review Comment:
Done, thank you!
##########
dev/merge_spark_pr.py:
##########
@@ -779,17 +796,30 @@ def cherry_pick(pr_num, merge_hash, default_branch,
branch_names, target_ref, al
{"b": ["b", "both", ""], "o": ["o", "only"], "a": ["a", "abort"]},
)
if choice == "b":
- picked_x = _do_cherry_pick(pr_num, merge_hash, sibling_x)
- picked_n = _do_cherry_pick(pr_num, merge_hash, pick_ref)
- return [picked_x, picked_n]
+ # Preserve any pick that already pushed: if the branch-M.N pick is
skipped after
Review Comment:
Fixed!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
