Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- If send_file_name() gets f set to -2, it skips the local filter rules.
[rsync/rsync.git]
/
testsuite
/
merge.test
diff --git
a/testsuite/merge.test
b/testsuite/merge.test
index
43b89bc
..
b4b3daf
100644
(file)
--- a/
testsuite/merge.test
+++ b/
testsuite/merge.test
@@
-7,23
+7,20
@@
# Make sure we can merge files from multiple directories into one.
# Make sure we can merge files from multiple directories into one.
-.
$srcdir/testsuite/rsync.fns
+.
"$suitedir/rsync.fns"
set -x
# Build some files/dirs/links to copy
set -x
# Build some files/dirs/links to copy
-fromdir="$scratchdir/from"
from1dir="${fromdir}1"
from2dir="${fromdir}2"
from3dir="${fromdir}3"
from1dir="${fromdir}1"
from2dir="${fromdir}2"
from3dir="${fromdir}3"
-todir="$scratchdir/to"
-chkdir="$scratchdir/chk"
mkdir "$from1dir" "$from2dir" "$from3dir"
mkdir "$from2dir"/sub1 "$from3dir"/sub1
mkdir "$from1dir" "$from2dir" "$from3dir"
mkdir "$from2dir"/sub1 "$from3dir"/sub1
-mkdir "$from3dir"/sub2
-mkdir "$chkdir" "$chkdir"/sub1 "$chkdir"/sub2
+mkdir "$from3dir"/sub2
"$from1dir"/dir-and-not-dir
+mkdir "$chkdir" "$chkdir"/sub1 "$chkdir"/sub2
"$chkdir"/dir-and-not-dir
echo "one" >"$from1dir"/one
cp -p "$from1dir"/one "$from2dir"/one
cp -p "$from1dir"/one "$from3dir"/one
echo "one" >"$from1dir"/one
cp -p "$from1dir"/one "$from2dir"/one
cp -p "$from1dir"/one "$from3dir"/one
@@
-37,13
+34,18
@@
cp -p "$from2dir"/sub1/uno "$from3dir"/sub1/uno
echo "sub2" >"$from3dir"/sub1/dos
echo "sub3" >"$from2dir"/sub1/tres
echo "subby" >"$from3dir"/sub2/subby
echo "sub2" >"$from3dir"/sub1/dos
echo "sub3" >"$from2dir"/sub1/tres
echo "subby" >"$from3dir"/sub2/subby
+echo "extra" >"$from1dir"/dir-and-not-dir/inside
+echo "not-dir" >"$from3dir"/dir-and-not-dir
cp -p "$from1dir"/one "$from1dir"/two "$from2dir"/three "$from3dir"/four "$from1dir"/five "$from3dir"/six "$chkdir"
cp -p "$from1dir"/one "$from1dir"/two "$from2dir"/three "$from3dir"/four "$from1dir"/five "$from3dir"/six "$chkdir"
+cp -p "$from1dir"/dir-and-not-dir/inside "$chkdir"/dir-and-not-dir
cp -p "$from2dir"/sub1/uno "$from3dir"/sub1/dos "$from2dir"/sub1/tres "$chkdir"/sub1
cp -p "$from3dir"/sub2/subby "$chkdir"/sub2
# Get rid of any directory-time differences
cp -p "$from2dir"/sub1/uno "$from3dir"/sub1/dos "$from2dir"/sub1/tres "$chkdir"/sub1
cp -p "$from3dir"/sub2/subby "$chkdir"/sub2
# Get rid of any directory-time differences
-$RSYNC -av --existing --include='*/' --exclude='*' "$from1dir/" "$from2dir/" "$from3dir/" "$chkdir/"
+touch "$from1dir" "$from2dir" "$from3dir" \
+ "$from1dir"/dir-and-not-dir "$from2dir"/sub1 "$from3dir"/sub1 "$from3dir"/sub2 \
+ "$chkdir" "$chkdir"/dir-and-not-dir "$chkdir"/sub1 "$chkdir"/sub2
checkit "$RSYNC -aHvv \"$from1dir/\" \"$from2dir/\" \"$from3dir/\" \"$todir/\"" "$chkdir" "$todir"
checkit "$RSYNC -aHvv \"$from1dir/\" \"$from2dir/\" \"$from3dir/\" \"$todir/\"" "$chkdir" "$todir"