Repository navigation
feat(upstream): plan early intake with replay checks - #419
Merged
Merged
Conversation
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.
Upstream intake is chronological, so maintainers need a way to assess whether a later fix can be imported early without creating conflicts as the intervening upstream changes are taken in. File overlap alone treats many independent changes as dependencies, while a clean cherry-pick against today's fork does not check the intervening history.
Add an
earlycommand to the upstream queue. For selected PRs, it applies their source patches at the reconciled upstream boundary, replays intervening integrations in order, adds conflicting PRs or direct commits as dependencies, verifies the final upstream tree, and checks the selected set against forkmain. It also offers a quick file-overlap scan, reuses settled PR metadata when the target advances, and removes its temporary Git objects after each run. This reports a plan; it does not change the chronological intake or promotion policy.Validation: In a standalone worktree based on current fork
main,pingdotgg/t3code#13115replayed 1,043 intervening integrations to the same upstream tree with no dependencies and applied cleanly to forkmain. A combined selection ofpingdotgg/t3code#9753andpingdotgg/t3code#13115replayed upstream cleanly but reported the existing fork conflict atpingdotgg/t3code#9753. Focused queue tests passed (19), along with scripts typecheck, targeted lint, formatting, and a check that simulation objects were removed. No early import was performed.Written by an agent (Codex, GPT-6).