Repository navigation
fix: restore #4527, #4528 and #4530 dropped from the release branch - #4587
Merged
Merged
Conversation
ScriptedAlchemy
enabled auto-merge (squash)
October 27, 2026 21:08
|
![devin-ai-integration[bot]](https://avatars.githubusercontent.com/in/811515?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
🔍 Devin Review: 1 flag
Not posted on this PR by your GitHub settings — view it in Devin Review. (Configure)
The restored package-boundary helper defaulted to the old module-level REPO, which #4543 replaced with the runfiles-resolved workspace. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
ScriptedAlchemy
disabled auto-merge
October 27, 2026 23:21
Owner
Author
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.
Problem
#4527, #4528 and #4530 show as merged, but their changes never reached
master. They were part of a stack based on release-please's branch, so GitHub merged them intorelease-please--branches--master--components--tracedecay. Release-please later regenerated that branch, and the merge commits (d2abbd2,f88d52f,1141108) are gone. Sampling each PR's added lines finds almost none onmaster.Fix
Cherry-picks only each PR's own commit onto
master, in stack order, leaving out the release version-bump commits that came in through the release-branch merge:6b5a992fix(privacy): protect YAML keys and BOM-prefixed documents (fix(privacy): protect YAML keys and BOM-prefixed documents #4527)fbb57b0fix(config): retire unused sync controls (fix(config): retire unused sync controls #4528)f419918simplify(search-eval): embed the canonical corpus (simplify(search-eval): embed the canonical corpus #4530)The only conflict was the test import list in
tracedecay-configuration/src/config/mod.rs, resolved by taking the union of both sides. The remaining stack (#4531 → #4529 → #4534 → #4541) will be rebuilt on top of this.Verification
cargo +1.99.0 clippy -D warningson privacy, domain, configuration, global-db and search-eval (lib and tests): cleanrustfmt-clean; the reported files are eval fixtures, which the gate excludes--check🤖 Generated with Claude Code