diff options
| author | Colin Walters <walters@verbum.org> | 2017-09-08 17:07:45 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-09-13 19:19:33 +0000 |
| commit | 051cdf396c4e2aed6fc1aad74dbf4d1a064b72d7 (patch) | |
| tree | 3077f968b545dfd9855e979e01493cec27d191b2 /man/ostree-checkout.xml | |
| parent | 8d3752a0d6034b378724134277e0fa1004591bb6 (diff) | |
| download | ostree-051cdf396c4e2aed6fc1aad74dbf4d1a064b72d7.tar.gz | |
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
Diffstat (limited to 'man/ostree-checkout.xml')
| -rw-r--r-- | man/ostree-checkout.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/man/ostree-checkout.xml b/man/ostree-checkout.xml index 07d44b34..aba70741 100644 --- a/man/ostree-checkout.xml +++ b/man/ostree-checkout.xml @@ -98,11 +98,12 @@ Boston, MA 02111-1307, USA. </varlistentry> <varlistentry> - <term><option>--disjoint-union</option></term> + <term><option>--union-identical</option></term> - <listitem><para> - When layering checkouts, error out if a file would be replaced, but add new files and directories - </para></listitem> + <listitem><para>Like <literal>--union</literal>, but error out + if a file would be replaced with a different file. Add new files + and directories, ignore identical files, and keep existing + directories. Requires <literal>-H</literal>.</para></listitem> </varlistentry> <varlistentry> |