New and improved cherry-pick support#203
Merged
Merged
Conversation
Contributor
|
🔧 Report generated by pr-comment-scanbuild Scan-Build Report
Bug Summary
Reports
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Contributor
jbachorik
force-pushed
the
jb/cherry_support
branch
3 times, most recently
from
April 11, 2025 10:11
a6c0ca3 to
403e9c7
Compare
jbachorik
force-pushed
the
jb/cherry_support
branch
from
April 11, 2025 10:12
403e9c7 to
1b6bfa1
Compare
MattAlp
approved these changes
Apr 11, 2025
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
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 does this PR do?:
It adds a better support for cherry-picking. We are not relying on filtered repo any more and instead do on-the-fly path translation and trimming of the changesets.
The usage is
./utils/cherry.sh <commit>and the prerequisite is to have the upstream repo added as a remote, either manually or by./utils/init_cherrypick_repo.shMotivation:
Make the cherry-picks from upstream easier to do while keeping the history.
Additional Notes:
Unsure? Have a question? Request a review!