X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/108133689de94aebca29b41cf8f0156fd03123a1..a055dbdd883a3c04318e13211c3ef7942314bee7:/testsuite/merge.test

diff --git a/testsuite/merge.test b/testsuite/merge.test
index 2c3844cc..4e76102d 100644
--- a/testsuite/merge.test
+++ b/testsuite/merge.test
@@ -14,30 +14,36 @@
 # Use local dirnames to better exercise the arg-parsing code.
 cd "$tmpdir"
 
-mkdir from1 from2 from3
+mkdir from1 from2 from3 deep
 mkdir from2/sub1 from3/sub1
 mkdir from3/sub2 from1/dir-and-not-dir
-mkdir -p chk/sub1 chk/sub2 chk/dir-and-not-dir
+mkdir chk chk/sub1 chk/sub2 chk/dir-and-not-dir
 echo "one" >from1/one
-cp -p from1/one from2/one
-cp -p from1/one from3/one
+cp_touch from1/one from2/one
+cp_touch from1/one from3/one
 echo "two" >from1/two
 echo "three" >from2/three
 echo "four" >from3/four
 echo "five" >from1/five
 echo "six" >from3/six
 echo "sub1" >from2/sub1/uno
-cp -p from2/sub1/uno from3/sub1/uno
+cp_touch from2/sub1/uno from3/sub1/uno
 echo "sub2" >from3/sub1/dos
 echo "sub3" >from2/sub1/tres
 echo "subby" >from3/sub2/subby
 echo "extra" >from1/dir-and-not-dir/inside
 echo "not-dir" >from3/dir-and-not-dir
+echo "arg-test" >deep/arg-test
+echo "shallow" >shallow
 
-cp -p from1/one from1/two from2/three from3/four from1/five from3/six chk
-cp -p from1/dir-and-not-dir/inside chk/dir-and-not-dir
-cp -p from2/sub1/uno from3/sub1/dos from2/sub1/tres chk/sub1
-cp -p from3/sub2/subby chk/sub2
+cp_touch from1/one from1/two from2/three from3/four from1/five from3/six chk
+cp_touch deep/arg-test shallow chk
+cp_touch from1/dir-and-not-dir/inside chk/dir-and-not-dir
+cp_touch from2/sub1/uno from3/sub1/dos from2/sub1/tres chk/sub1
+cp_touch from3/sub2/subby chk/sub2
+
+# Make sure that time has moved on.
+sleep 1
 
 # Get rid of any directory-time differences
 $RSYNC -av --existing -f 'exclude,! */' from1/ from2/
@@ -45,8 +51,7 @@ $RSYNC -av --existing -f 'exclude,! */' from2/ from3/
 $RSYNC -av --existing -f 'exclude,! */' from1/ chk/
 $RSYNC -av --existing -f 'exclude,! */' from3/ chk/
 
-# TODO: fix inc-recurse unduplications of directory contents!
-checkit "$RSYNC -avv --no-ir from1/ from2/ from3/ to/" chk to
+checkit "$RSYNC -avv deep/arg-test shallow from1/ from2/ from3/ to/" "$chkdir" "$todir"
 
 # The script would have aborted on error, so getting here means we've won.
 exit 0