-
-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
214a1f9
commit 3ac3bee
Showing
5 changed files
with
74 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
scratch/merged | ||
scratch/merged/bar | ||
scratch/merged/baz | ||
scratch/merged/baz/qux | ||
scratch/merged/foo |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
test "$UNAME" = "Linux" || skip | ||
clean_scratch | ||
"$XTOUCH" -p scratch/{lower/{foo,bar,baz},upper/{bar,baz/qux}} | ||
mkdir -p scratch/{work,merged} | ||
bfs_sudo mount -t overlay overlay -olowerdir=scratch/lower,upperdir=scratch/upper,workdir=scratch/work scratch/merged || skip | ||
trap "bfs_sudo umount scratch/merged; bfs_sudo rm -rf scratch/work" EXIT | ||
bfs_diff scratch/merged |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
scratch | ||
scratch/lower | ||
scratch/lower/bar | ||
scratch/lower/baz | ||
scratch/lower/foo | ||
scratch/upper | ||
scratch/upper/bar | ||
scratch/upper/baz | ||
scratch/upper/baz/qux | ||
scratch/upper/foo |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
[[ "$UNAME" == *BSD* ]] || skip | ||
clean_scratch | ||
"$XTOUCH" -p scratch/{lower/{foo,bar,baz},upper/{bar,baz/qux}} | ||
bfs_sudo mount -t unionfs -o below scratch/{lower,upper} || skip | ||
trap "bfs_sudo umount scratch/upper" EXIT | ||
bfs_diff scratch |