Repository navigation
fix(action): don't flag stacked PRs as outdated when their base PR merges - #817
Open
danadajian wants to merge 1 commit into
Open
danadajian wants to merge 1 commit into
danadajian wants to merge 1 commit into
Conversation
Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
This branch has not been deployed
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.
Summary
#1merges,manifest-mergeflags every open PR whose changeset disagrees with the merged changeset with "Visual comparison outdated — please rebase." A PR stacked on PR#1(its base branch is PR#1's branch) that also changes the same screenshot was wrongly flagged: it legitimately holds a different hash because it changed the screenshot again on top of PR#1, and it is already rebased on PR#1._headShaits changeset already records) and only flags a path when that baseline disagrees with what actually merged. A stacked PR's baseline already contains PR#1's screenshots, so its overlapping paths are recognized as stacked and skipped.#1changes the screenshot again after the stacked PR's last visual run, the stacked PR's baseline holds the older hash and it is still flagged. PRs targeting main directly behave exactly as before. Changesets without_headShafall back to the previous behavior.Test plan
bunx nx test action— 236 pass, including six new stacked-PR cases (stacked path skipped, deletion re-added on top skipped, re-pushed base PR still flagged, mixed stacked/stale paths reports only stale ones, no_headShafallback, no lookup when nothing disagrees)bun lint,bun tsc,bun format-checkbunx nx build actionand committedaction/dist🤖 Generated with Claude Code