From 4571df58c6447337d564b409a866cad38a85a691 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Tue, 14 Dec 2004 19:41:19 +0000 Subject: [PATCH] Got rid of the rare failure caused by a directory-time mismatch. --- testsuite/merge.test | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testsuite/merge.test b/testsuite/merge.test index 0ef39849..1dddf630 100644 --- 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 -$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" -- 2.34.1