Uh oh!
There was an error while loading. Please reload this page.
tools: restore consolidate.sh onto the consolidated main - #79
Merged
Conversation
`tools/consolidate.sh` is the frozen rule set that built this consolidated tree. It was developed on `claude/consolidate-script` (PR #78) but was never merged, so `fastfields-lib@85f987e` -- one of the six inputs to the consolidation -- did not contain it, and it is therefore absent from the consolidated history. It is restored here as an ordinary commit on the rewritten `main` rather than by merging #78 and rebuilding: rebuilding would change `main`'s SHA, and the 159 irreproducible `teeny` commits sit directly on top of it. PR #78 is closed as superseded (its base branch no longer exists). The blob is byte-identical to `claude/consolidate-script@c55e791` (blob 4255943), including the path-rewrite hazards block in the header. NOTE: merging this shifts `main`'s tree hash from 828c916 by exactly this one added file. That is expected and is not consolidation drift -- the baseline gate should be re-pinned to the post-merge tree.
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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Restores
tools/consolidate.sh— the frozen rule set that produced this consolidated tree.Why it went missing
consolidate.shwas developed onclaude/consolidate-script(#78) and never merged. The consolidation was built from the six source repos'mainbranches, andfastfields-lib@85f987edid not contain the script — so it is absent from the consolidated history through no fault of the rewrite.Why it is restored this way rather than by rebuilding
Merging #78 and re-running the consolidation would change
claude/consolidated-main's SHA. The 159teenycommits sit directly on top of that SHA and are irreproducible, so a rebuild would force a rebase of exactly the work that cannot be regenerated. Adding the script as an ordinary commit on the rewrittenmainavoids that entirely.#78 is closed as superseded — its base branch no longer exists after the rewrite.
Content
The blob is byte-identical to
claude/consolidate-script@c55e791(blob4255943, mode100755, 1432 lines), including the path-rewrite hazards block in the header that documents the once-onlygit filter-repo --refs main teenyinvariant.Expected tree-hash shift — please read before running the baseline gate
main's tree hash is828c9164…as consolidated. Merging this PR shifts it tod42a474a…by exactly this one added file.That is expected and is not consolidation drift. Anyone re-running the baseline gate against the old pinned tree hash should re-pin it to the post-merge value rather than treat the mismatch as a regression.
Generated by Claude Code