From bf10faa9dcf6c11bcc85a32e1cda070c4acf21de Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Sun, 29 Apr 2007 15:01:57 +0000
Subject: [PATCH] Added a "sleep 1" to make certain failures more reproducible.

---
 testsuite/merge.test | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/testsuite/merge.test b/testsuite/merge.test
index cd10a2aa..cc979bc4 100644
--- a/testsuite/merge.test
+++ b/testsuite/merge.test
@@ -42,6 +42,9 @@ 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/
-- 
2.34.1