core: Add --union mode to checkout

This is another step towards ostbuild using this instead of the
"compose" builtin.
This commit is contained in:
Colin Walters committed 2012-03-06 11:59:06 -05:00
1 parent 83fb6d56e1
commit 76bc35186e
6 files changed
+210 -21

No files matched your search

+11 -1
View File
@@ -19,7 +19,7 @@
set -e
echo "1..27"
echo "1..28"
. libtest.sh
@@ -196,3 +196,13 @@ $OSTREE checkout --subpath /yet/another test2 checkout-test2-subpath
cd checkout-test2-subpath
assert_file_has_content tree/green "leaf"
echo "ok checkout subpath"
cd ${test_tmpdir}
$OSTREE checkout --union test2 checkout-test2-union
find checkout-test2-union | wc -l > union-files-count
$OSTREE checkout --union test2 checkout-test2-union
find checkout-test2-union | wc -l > union-files-count.new
cmp union-files-count{,.new}
cd checkout-test2-union
assert_file_has_content ./yet/another/tree/green "leaf"
echo "ok checkout union 1"