Etc merge changes#2301
Queued
Johan-Liebert1 wants to merge 3 commits into
Queued
Conversation
Johan-Liebert1
force-pushed
the
etc-merge-changes
branch
2 times, most recently
from
df2466f to
e8b524d
Compare
jeckersb
reviewed
Jul 13, 2026
Johan-Liebert1
force-pushed
the
etc-merge-changes
branch
from
e8b524d to
9cbad29
Compare
We would have unmergable paths if a modified file was changed to a directory in the new etc or vice-versa. One of the major issues was that we were erroring out during "merge" which is not ideal. A new vector now keeps track of all unmergable paths and the reason they're not mergable. Ref: composefs/composefs-rs/issues/335 Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
Before we write the staged deployment file at `/run/composefs` and before we create new boot entries, we now compute the etc diff in advance to check whethere we will face any merge conflicts while finalizing the deployment. If we find conflicts we exit with and error and detailing where conflicts were found Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
This was predominantly AI generated with some minor tweaks from me. Makes sure that bootc upgrade/switch fails if merge conflicts are found during three way etc merge. Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
Johan-Liebert1
force-pushed
the
etc-merge-changes
branch
from
9cbad29 to
437433e
Compare
jeckersb
approved these changes
Jul 14, 2026
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.
etc-merge: Handle unmergable paths properly
We would have unmergable paths if a modified file was changed to a
directory in the new etc or vice-versa. One of the major issues was that
we were erroring out during "merge" which is not ideal. A new vector now
keeps track of all unmergable paths and the reason they're not mergable.
Ref: composefs/composefs-rs/issues/335
cfs/stage: Compute etc diff before staging
Before we write the staged deployment file at
/run/composefsandbefore we create new boot entries, we now compute the etc diff in
advance to check whethere we will face any merge conflicts while
finalizing the deployment. If we find conflicts we exit with and error
and detailing where conflicts were found
tmt: Add tests for etc merge conflict
This was predominantly AI generated with some minor tweaks from me.
Makes sure that bootc upgrade/switch fails if merge conflicts are found
during three way etc merge.