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
(from parent 1:
a6e7b97
)
Got rid of the --no-ir kluge in this test.
author
Wayne Davison
<wayned@samba.org>
Thu, 26 Apr 2007 23:15:51 +0000
(23:15 +0000)
committer
Wayne Davison
<wayned@samba.org>
Thu, 26 Apr 2007 23:15:51 +0000
(23:15 +0000)
testsuite/merge.test
patch
|
blob
|
blame
|
history
diff --git
a/testsuite/merge.test
b/testsuite/merge.test
index
e1d1fc1
..
cd10a2a
100644
(file)
--- a/
testsuite/merge.test
+++ b/
testsuite/merge.test
@@
-48,8
+48,7
@@
$RSYNC -av --existing -f 'exclude,! */' from2/ from3/
$RSYNC -av --existing -f 'exclude,! */' from1/ chk/
$RSYNC -av --existing -f 'exclude,! */' from3/ chk/
-# TODO: fix inc-recurse unduplications of directory contents!
-checkit "$RSYNC -avv --no-ir deep/arg-test shallow from1/ from2/ from3/ to/" chk to
+checkit "$RSYNC -avv deep/arg-test shallow from1/ from2/ from3/ to/" chk to
# The script would have aborted on error, so getting here means we've won.
exit 0