Repository navigation
Fix conflicting workspace template fragments - #7501
Merged
Merged
Conversation
Workspace fragments can provide the same target file. Unconditionally concatenating their content corrupts shared files and hides conflicting selections. Deduplicate byte-identical contributions, reject conflicting non-append content before writing, and write the base before append contributions with line separation. Correct update removal so callers can resolve conflicts. Report conflicting files and fragment names in the new-workspace wizard and bnd add fragment. Add regression coverage and document duplicate, append, and conflict behavior. Validation: all 13 TemplateFragmentsTest tests passed with no skips; CLI and bndtools.core compileJava tasks passed; git diff --check passed. Full workspace build and live Eclipse UI validation were not run. Signed-off-by: peterkir <peter@klib.io>
peterkir
force-pushed
the
fea-fragment-import-conflicts
branch
from
October 28, 2026 10:18
99acb05 to
b4cd769
Compare
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.
Workspace fragments can provide the same target file. Unconditionally concatenating their content corrupts shared files and hides conflicting selections.
Deduplicate byte-identical contributions, reject conflicting non-append content before writing, and write the base before append contributions with line separation. Correct update removal so callers can resolve conflicts.
Report conflicting files and fragment names in the new-workspace wizard and bnd add fragment. Add regression coverage and document duplicate, append, and conflict behavior.
Validation: all 13 TemplateFragmentsTest tests passed with no skips; CLI and bndtools.core compileJava tasks passed; git diff --check passed. Full workspace build and live Eclipse UI validation were not run.
Signed-off-by: peterkir peter@klib.io