Fix bugs found when trying to uplift #1655
Merged
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.
Description
Fix bugs found when trying to uplift #1632
The original (merged) version of the script was not using the SHA for comparing PR branch against what used to be master (instead, it would compare master against master). This caused any merged PRs to not work as expected
This fixes the problem by instead by comparing HEAD against the SHA pre-merge
Commit message details:
Usage that was breaking
./script/pr.py --reviewers=bbondy,kjozwiak,rebron,srirambv --owners=bsclifton --uplift-to=release --uplift-using-pr=1632