chore: add make upstream-review-pr to show a rolling rebase as a diff against main - #1141
Merged
Merged
Conversation
… against main The rolling branch's own PR against main diffs against the old upstream base, so it re-adds the whole fork (~750k lines) and hides what the rebase changed. The new target pushes a review-only draft PR whose head tree is identical to the rolling tip but whose history is main + an automatic merge of the new upstream base + one commit holding every conflict resolution and fork adaptation. The PR body also summarises git range-diff over the fork commits.
Deeds67
added
changelog:chore
Deeds67
added a commit
that referenced
this pull request
Sep 27, 2026
… against main (#1141) The rolling branch's own PR against main diffs against the old upstream base, so it re-adds the whole fork (~750k lines) and hides what the rebase changed. The new target pushes a review-only draft PR whose head tree is identical to the rolling tip but whose history is main + an automatic merge of the new upstream base + one commit holding every conflict resolution and fork adaptation. The PR body also summarises git range-diff over the fork commits.
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.
Adds
make upstream-review-pr(scripts/upstream-review-pr.sh). It's run on request, not as part of every rebase cycle.The rolling branch's own PR against
mainre-adds the whole fork (~750k lines), because GitHub diffs it against the old upstream base. This target instead pushes a review-only draft PRreview/<rolling-name>→mainwith two commits:git merge-treeof the new upstream base intomain. Conflicted files keep their conflict markers.The PR body also includes
git range-diffcounts for the fork commits.DRY_RUN=1prints the result without pushing, and re-running updates an open review PR in place. The review PR is never merged; landing is unchanged.Tested against
rebase/upstream-rolling-v3.3.0: dry run, then a real run that opened #1140 (now closed). The pushed tree matched the rolling tip, andshellcheckpasses.