Skip to content

Commit efca3f6

Browse files
etc-merge: Refactor and fix dir perms while merging
While merging, existing directory in new_etc was being recursively deleted which is not correct as any new files might also be deleted. Instead, we simply create a directory if it doesn't exists, or if it does exists, we update its metadata accordingly. Add some test cases for the above. Signed-off-by: Johan-Liebert1 <[email protected]> cli: Add internal opt for printing etc-diff Signed-off-by: Johan-Liebert1 <[email protected]> etc-merge: Add license to Cargo.toml Signed-off-by: Johan-Liebert1 <[email protected]>
1 parent 64f0490 commit efca3f6

File tree

5 files changed

+207
-126
lines changed

5 files changed

+207
-126
lines changed

Cargo.lock

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/etc-merge/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
name = "etc-merge"
33
version = "0.1.0"
44
edition = "2024"
5+
license = "MIT OR Apache-2.0"
6+
publish = false
57

68
[dependencies]
79
anyhow = { workspace = true }

0 commit comments

Comments
 (0)