Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
548ca46
)
Added a "sleep 1" to make certain failures more reproducible.
author
Wayne Davison
<wayned@samba.org>
Sun, 29 Apr 2007 15:01:57 +0000
(15:01 +0000)
committer
Wayne Davison
<wayned@samba.org>
Sun, 29 Apr 2007 15:01:57 +0000
(15:01 +0000)
testsuite/merge.test
patch
|
blob
|
blame
|
history
diff --git
a/testsuite/merge.test
b/testsuite/merge.test
index
cd10a2a
..
cc979bc
100644
(file)
--- 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
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/
# Get rid of any directory-time differences
$RSYNC -av --existing -f 'exclude,! */' from1/ from2/
$RSYNC -av --existing -f 'exclude,! */' from2/ from3/