trunk-merge/pr-851/1fba2368-bf08-4abf-827a-f97c545a2718 - #854
Closed
trunk-io[bot] wants to merge 2 commits into
Closed
trunk-merge/pr-851/1fba2368-bf08-4abf-827a-f97c545a2718#854trunk-io[bot] wants to merge 2 commits into
trunk-io[bot] wants to merge 2 commits into
Conversation
…-323 A concurrent-merge window landed two records claiming the same ledger ids: #836 (RIG-2616 error/abort surfacing) allocated DL-318/319/320 off a pre-#833 main, but #833 (RIG-3139 embedded-revival), merged first, already held DL-319/320/321. The double-booked DL-319/320 fail design-ledger-gate:check on main ("duplicate ledger id"), which fail-fast-cancels the whole moon(bun) battery and blocks every open PR in the repo. Renumber this record's two rows to the next free ids (max on main is 321): DL-319 to DL-322 (emit rule), DL-320 to DL-323 (FrameSink never-drop routing). DL-318 is unchanged; #833's ids are load-bearing supersede pointers and stay put. Also annotates the frozen record header with the mapping (annotate-don't-rewrite house rule). Byte-identical to the ledger hunks already carried by #850 (RIG-2616 T2); landing it standalone on main unblocks the fleet ahead of the stack. Ledger-impact: renumber DL-319 to DL-322 (emit rule) and DL-320 to DL-323 (FrameSink never-drop routing); no new rows. Co-authored-by: Matt Wilkinson <matt@rigel.build>
|
Compass engineering docs preview: https://trunk-merge-pr-851-1fba2368.compass-eng-docs.pages.dev Deployed from Changed pages: |
trunk-io
Bot
deleted the
trunk-merge/pr-851/1fba2368-bf08-4abf-827a-f97c545a2718
branch
September 3, 2026 18:34
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.
This pull request was created and is being managed by Trunk Merge.
This pull request is based on the main branch at SHA e54f5dca8d0cbb2334e3f2a9bd4b9e684a7b5fbe.
See more details here.
When CI completes, this pull request will be closed automatically.
Pull Requests Being Tested
This pull request is testing the changes from pull request 851.