Skip to content

feat(upstream): import open PRs as provisional snapshots - #699

Merged
incognitojam merged 1 commit into
mainfrom
styal/provisional-upstream-imports
Oct 10, 2026
Merged

incognitojam merged 1 commit into
mainfrom
styal/provisional-upstream-imports

Conversation

@incognitojam

Copy link
Copy Markdown
Owner

Open upstream PRs currently require importing every constituent commit with Upstream-Commit provenance, because an Upstream-PR trailer would make the queue skip the eventual upstream merge. Open-PR intake now uses one attributed snapshot commit with Upstream-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).

@incognitojam
incognitojam force-pushed the styal/provisional-upstream-imports branch from 274ef3e to 9039b64 Compare October 10, 2026 11:54
@github-actions

Copy link
Copy Markdown

Upstream divergence

Both sides are compared with upstream at the in-order tip 567783ecdc. Excludes .repos/ and pnpm-lock.yaml.

Measure Base This PR Change
Upstream files the fork changes 1,188 1,188 0
Lines changed in them 63,615 63,615 0
Upstream files the fork removes 37 37 0
Fork-only files 344 345 +1
Fork-only lines 48,099 48,752 +653

No upstream file changes how much it differs from upstream.

@incognitojam
incognitojam enabled auto-merge (squash) October 10, 2026 11:56
@incognitojam
incognitojam merged commit 666d127 into main Oct 10, 2026
27 checks passed
@incognitojam
incognitojam deleted the styal/provisional-upstream-imports branch October 10, 2026 11:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant