Commit ccc558c
committed
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]>
etc-merge: More refactoring
Signed-off-by: Johan-Liebert1 <[email protected]>1 parent dff69a9 commit ccc558c
File tree
5 files changed
+228
-147
lines changed- crates
- etc-merge
- src
- lib
- src
5 files changed
+228
-147
lines changedSome generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
| 6 | + | |
5 | 7 | | |
6 | 8 | | |
7 | 9 | | |
| |||
0 commit comments