fix(mirror): regenerate stale mirror patches and stop flagging unused variants - #16
Merged
Merged
Conversation
…sed variants 0006 was generated against a sidebar blob that only existed locally, so CI's depth-1 fetch could not 3-way merge it and the plain fallback broke on upstream pingdotgg#13207's Separator change. Regenerated against main. The stale-patch report now treats NNNN variants as alternatives, like the apply script, instead of listing the unused variant of a working group. Closes #15 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
0001-0003 still applied, but their pre-image blobs had fallen off main, so CI's depth-1 fetch could only plain-apply them and the next upstream edit near a hunk would break them. Regenerated against main; hunk content is unchanged, only index lines and offsets move. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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.
The nightly build for
v0.0.43-nightly.20260923.2150failed on0006-mirror-release-changelog.patch(#15). The patch's pre-image blob forSidebarUpdateReleaseNotes.tsxwas never pushed; it only existed in local checkpoint refs. CI's depth-1 fetch therefore couldn't 3-way merge it. The plain-apply fallback then failed on upstream pingdotgg#13207, which changed theSeparatorclass in the context lines.main. Its content is unchanged apart from that one context line.maintoo. They still applied, but their pre-image blobs had also fallen offmain, so they were one upstream edit away from the same failure. Onlyindexlines and hunk offsets change.report-stale-patch.shnow treatsNNNNvariants as alternatives, likeapply-mirror-patches.shdoes. The issue listed the unused0003-…wslprebuildand0004-…appidentityvariants as stale even though their groups applied fine.Verified in a CI-shaped shallow clone of the tag plus a depth-1 fetch of this branch. All six patches apply with a real 3-way merge, with no "lacks the necessary blob" errors. With the old 0006 staged and
ghstubbed, the report script lists only0006.After merging, re-run Mirror Linux build for
v0.0.43-nightly.20260923.2150.Closes #15
🤖 Generated with Claude Code