dissect: Use COPY_MERGE #35956
Open
dissect: Use COPY_MERGE #35956
+3
−3
Conversation
This file contains 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
When copying a directory from or to an image, let's always merge with existing directories instead of failing with "File Exists". Fixes systemd/mkosi#3342.
github-actions
bot
added
dissect
please-review
bluca
approved these changes
Jan 10, 2025
bluca
added
good-to-merge/waiting-for-ci 👍
|
Maybe add a small note to the man page? - If the source path in the image refers to a directory, it is copied to the destination path, recursively with all containing files and directories.
+ If the source path in the image refers to a directory, it is copied to the destination path, recursively with all containing files and directories, merging into existing directories and updating already existing files. |
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.
When copying a directory from or to an image, let's always merge with existing directories instead of failing with "File Exists".
Fixes systemd/mkosi#3342.