Repository navigation
feat(upstream): import open PRs as provisional snapshots - #699
Merged
Merged
Conversation
incognitojam
force-pushed
the
styal/provisional-upstream-imports
branch
from
October 10, 2026 11:54
274ef3e to
9039b64
Compare
Upstream divergenceBoth sides are compared with upstream at the in-order tip
No upstream file changes how much it differs from upstream. |
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.
Open upstream PRs currently require importing every constituent commit with
Upstream-Commitprovenance, because anUpstream-PRtrailer would make the queue skip the eventual upstream merge. Open-PR intake now uses one attributed snapshot commit withUpstream-PR, followed by a separate tracking commit recording the reviewed base and head SHAs and the reconciliation plan.Provisional markers keep the final integration pending until explicit reconciliation and cleanup. The intake audit requires the marker and compares the implementation with the frozen aggregate diff. Closed imports are flagged for review. Queue and candidate reports read committed tracking metadata from the selected fork ref, and lag history records completion at cleanup rather than retroactively at the snapshot import. The runbook and feature ledger describe this workflow, including reconciliation when a PR merges, closes, or reopens.
Validation: 54 focused upstream tests passed, including a disposable Git repository running the actual audit, queue, and tracked-report commands. A two-commit source matched the single snapshot's aggregate diff; provisional imports stayed selectable and blocked baseline advancement; draft tracking edits did not change committed-ref reports; an identical final change completed only at cleanup; and a closed-import decision did not account for a later reopened merge. Scripts typecheck, scoped lint, and the fork feature ledger check passed.
Written by an agent (Codex, GPT-6).