From: Wayne Davison <wayned@samba.org>
Date: Tue, 15 Feb 2005 02:01:02 +0000 (+0000)
Subject: Make sure that there are no directory-time differences between the
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/2f24fb18c428105cddce35cfa504e2d21c35a460

Make sure that there are no directory-time differences between the
dirs that might trip up the check of the merged copy.
---

diff --git a/testsuite/merge.test b/testsuite/merge.test
index b4b3dafa..cc7f1887 100644
--- a/testsuite/merge.test
+++ b/testsuite/merge.test
@@ -43,9 +43,10 @@ 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
-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
+$RSYNC -av --existing -f 'exclude,! */' "$from1dir/" "$from2dir/"
+$RSYNC -av --existing -f 'exclude,! */' "$from2dir/" "$from3dir/"
+$RSYNC -av --existing -f 'exclude,! */' "$from1dir/" "$chkdir/"
+$RSYNC -av --existing -f 'exclude,! */' "$from3dir/" "$chkdir/"
 
 checkit "$RSYNC -aHvv \"$from1dir/\" \"$from2dir/\" \"$from3dir/\" \"$todir/\"" "$chkdir" "$todir"