Repository navigation
Conversation
…d verify that nothing else slipped in Derived from the branch history (no manifest file): the ordered PRs, the latest merged head of each, and drift - a commit that is not a PR merge, a change hidden inside a merge, a conflict resolved by hand. docs/INTEGRATION-BRANCHES.md has the rule. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Contributor
Author
|
Superseded by the org-level version: sirosfoundation/.github#36 (plan-generated branches, verify, glue classification, a reusable workflow and PR comments; no sirosid-dev dependency). This PR should be closed once that direction is agreed. |
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.
Step 1 of the integration-branch plan: no manifest file in the branch; the history is the record and a tool reads it back.
What
scripts/integration.pywith two commands (docs:docs/INTEGRATION-BRANCHES.md):report --path <clone> --tip integration/<name> [--repos ...] [--json]: the base, the ordered PRs (the latest merged head of each; PR number/title/state/draft/labels from the GitHub API; whether the PR's head has moved since it was merged) and everything on the branch that is not a PR merge.verify ...: exit 1 when the branch contains anything a replay of its PR merges would not produce: a plain commit on the first-parent path, a merge whose result differs from the automatic merge of its parents (a change hidden in the merge commit), a merge that conflicts when replayed (a conflict resolved by hand inside the merge), or (with--repos) a merged head that is not any PR's head. Usesgit merge-tree --write-tree(git >= 2.38).Tests
tests/test_integration_tool.py(8) builds real git repositories: clean merges pass and are listed in order; a patch commit, a change inside a merge and a hand-resolved conflict each fail; a PR re-merged as it moved is one entry with its latest head; an unmapped head is reported; the CLI exit codes; the JSON shape. Proven non-vacuous: disabling the merge-tree comparison fails the hidden-change test, and treating plain commits as merges fails the patch test.First run on the real branches (read-only, nothing changed)
integration/gdc-nymauth-v5@c8c5b1eafd0ff08c14ca3cf8ebaceaa4473533f0: 57 merges, 12 PRs (all in SUNET/vc: feat(issuer): seed-backed commitment claims, derived sources SUNET/vc#793 and Feat/auth scope document claims merge SUNET/vc#838 merged since, and open 821, 825, 826, 827, 829, 830, 831, 832, 839, 840). Correction: this PR's first report attributed most of these to the forksirosfoundation/vc; GitHub answers the pulls lookup on a fork with the UPSTREAM's PRs, so their numbers belong to SUNET/vc. Fixed in integration: sync from a PR list, and the CI build that refuses a branch that does not verify #91 (the PR's base repository is used), 47 commits that are not merges of a PR (the branch started on a feature line) and 51 problems in all. Most of the PRs' heads have moved since they were merged (the branch is stale for them). The PIN PROVENANCE block inenvironments/gdc.yamldid not mention sirosfoundation/vc 825 and 826 at all.local/gdc-nymauth-integration-4@1d0708b13f7afe4752250f8e9fe04e0ab719c98f: 3 problems: the two known local-only commits (a25df83,1d0708b) and a conflict resolved by hand inside the #163 merge.So neither can be published as a documented bundle until it is regenerated from its PR list. That (a
synccommand that rebuilds the branch with merge messages naming the PR, and the CI build that refuses a branch that failsverify) is the next step; this PR changes no environment and no image.🤖 Generated with Claude Code