Reapply YAML deep-merge fix on v5#2527
Open
Siddharth2207 wants to merge 1 commit into2026-03-17-v5-revertfrom
Open
Reapply YAML deep-merge fix on v5#2527Siddharth2207 wants to merge 1 commit into2026-03-17-v5-revertfrom
Siddharth2207 wants to merge 1 commit into2026-03-17-v5-revertfrom
Conversation
…YAML Previously, when merging multiple YAML documents, entries under the same top-level section (e.g., two different deployers under `deployers:`) would be lost because the shallow merge simply replaced the entire hash. This implements deep recursive merging so that different entries under the same section are properly combined.
Contributor
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
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.
Summary
deployers:— second one would silently clobber the first)crates/settings/src/yaml/emitter.rsso entries under the same top-level section are properly combinedChanges
crates/settings/src/yaml/emitter.rs: addsdeep_merge_hashhelper and updatesemit_documentsto use it; adds regression testTest plan
test_emit_deep_merges_hash_sectionstest passes🤖 Generated with Claude Code