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
Check the "keep_dirs" var instead of "recurse" to decide if
[rsync/rsync.git]
/
testsuite
/
merge.test
diff --git
a/testsuite/merge.test
b/testsuite/merge.test
index
0ef3984
..
1dddf63
100644
(file)
--- a/
testsuite/merge.test
+++ b/
testsuite/merge.test
@@
-40,7
+40,9
@@
cp -p "$from2dir"/sub1/uno "$from3dir"/sub1/dos "$from2dir"/sub1/tres "$chkdir"/
cp -p "$from3dir"/sub2/subby "$chkdir"/sub2
# Get rid of any directory-time differences
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" \
+ "$from2dir"/sub1 "$from3dir"/sub1 "$from3dir"/sub2 \
+ "$chkdir" "$chkdir"/sub1 "$chkdir"/sub2
checkit "$RSYNC -aHvv \"$from1dir/\" \"$from2dir/\" \"$from3dir/\" \"$todir/\"" "$chkdir" "$todir"
checkit "$RSYNC -aHvv \"$from1dir/\" \"$from2dir/\" \"$from3dir/\" \"$todir/\"" "$chkdir" "$todir"