[SPARK-58944][INFRA][FOLLOWUP] Handle manually completed cherry-picks - #58521
Open
zhengruifeng wants to merge 1 commit into
Open
[SPARK-58944][INFRA][FOLLOWUP] Handle manually completed cherry-picks#58521zhengruifeng wants to merge 1 commit into
zhengruifeng wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
Record the target branch's HEAD before starting a cherry-pick. After a conflict is resolved,
continue the cherry-pick in the merge script only when HEAD is unchanged. If the committer already
completed the cherry-pick manually, proceed with the backport instead of invoking
git cherry-pick --continuea second time.Why are the changes needed?
Git tells committers resolving a cherry-pick conflict to run
git cherry-pick --continue. If theyfollow that instruction before returning to the merge script, the script currently tries to
continue the already-completed cherry-pick and fails with
no cherry-pick or revert in progress.Does this PR introduce any user-facing change?
Yes, for Spark committers using
dev/merge_spark_pr.py. The script now accepts an already-completedmanual conflict resolution. This only changes unreleased committer tooling.
How was this patch tested?
Ran
git diff --check.Ran
dev/merge_spark_pr.py --dry-run 58404, selectedbranch-4.2, reproduced the cherry-pickconflict, resolved it, and manually ran
git cherry-pick --continue. The script detected the newHEAD, skipped its second
--continue, reached the dry-run push, restored the original branch, andexited successfully without external changes.
Was this patch authored or co-authored using generative AI tooling?
Generated-by: OpenAI Codex (GPT-5)