override: sequence merge ignores strictly-identical duplicate entries - #924
Merged
Merged
Conversation
…ntries Merging sequences appended blindly: the same env_file declared in the base file and an override was applied twice, an identical mount or device entry was duplicated and rejected by the engine at create time. Two strictly identical entries never carry more meaning than one. Both merge regimes now drop an override entry deeply equal to one already present — the registered sequence merges and the default list merge — which also folds mergeExtraHosts (the one merger that already deduplicated) into mergeToSequence. Entries that differ in form (short vs long syntax of the same declaration) are not equal and are kept: the rule is strict identity, never equivalence. Consequence pinned by test: merging a value over an already-merged result is idempotent, so a resolved model can be reloaded and merged again without duplicating accumulated entries. Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Merged
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
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.
Merging sequences appended blindly: the same
env_filedeclared in base + override was applied twice, an identical mount or device entry was duplicated and rejected by the engine at create time. Two strictly identical entries never carry more meaning than one.Both merge regimes now drop an override entry deeply equal to one already present — the registered sequence merges and the default list merge — which folds
mergeExtraHosts(the one merger that already deduplicated) intomergeToSequence. Entries that differ in form (short vs long syntax of the same declaration) are not equal and are kept: the rule is strict identity, never equivalence.Property pinned by test: merging a value over an already-merged result is idempotent — the guarantee needed to resolve
pre_startinheritance at load time (#866 follow-up) without breakingconfiground-trips.🤖 Generated with Claude Code