lib/checkout: Rename disjoint union, change to merge identical files
It turns out that librpm automatically merges identical files between distinct packages, and this occurs in practice with Fedora today between `chkconfig` and `initscripts` for exmaple. Since we added this for rpm-ostree, we basically want to do what librpm does, let's change the semantics to do a merge. While we're here rename to `UNION_IDENTICAL`. Closes: #1156 Approved by: jlebon
This commit is contained in:
1 parent
8d3752a0d6
commit
051cdf396c
6 files changed
+208
-86
No files matched your search
+1
-1
@@ -696,7 +696,7 @@ _ostree_checkout() {
|
||||
--require-hardlinks -H
|
||||
--union
|
||||
--union-add
|
||||
--disjoint-union
|
||||
--union-identical
|
||||
--user-mode -U
|
||||
--whiteouts
|
||||
"
|
||||
|
||||
Reference in new issue
Block a user