Changed some instances of \" in checkit calls to '.

[rsync/rsync.git] / testsuite / merge.test

diff --git a/testsuite/merge.test b/testsuite/merge.test
index e1d1fc1..cc979bc 100644 (file)
--- a/testsuite/merge.test
+++ b/testsuite/merge.test
@@ -42,14 +42,16 @@ 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
 
+# Make sure that time has moved on.
+sleep 1
+
 # Get rid of any directory-time differences
 $RSYNC -av --existing -f 'exclude,! */' from1/ from2/
 $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 deep/arg-test shallow from1/ from2/ from3/ to/" chk to
+checkit "$RSYNC -avv deep/arg-test shallow from1/ from2/ from3/ to/" chk to
 
 # The script would have aborted on error, so getting here means we've won.
 exit 0