diff options
| author | Wayne Davison <wayned@samba.org> | 2004-12-14 19:41:19 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2004-12-14 19:41:19 +0000 |
| commit | 4571df58c6447337d564b409a866cad38a85a691 (patch) | |
| tree | a94d064514e838bacccc4c7b2aeb73f5454a517f /testsuite/merge.test | |
| parent | f6b384d41f056dea0ec9a0abe873be078fb09570 (diff) | |
| download | rsync-4571df58c6447337d564b409a866cad38a85a691.tar.gz | |
Got rid of the rare failure caused by a directory-time mismatch.
Diffstat (limited to 'testsuite/merge.test')
| -rw-r--r-- | testsuite/merge.test | 4 |
1 files changed, 3 insertions, 1 deletions
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" |