diff options
| author | Wayne Davison <wayned@samba.org> | 2007-04-26 23:15:51 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2007-04-26 23:15:51 +0000 |
| commit | a9a8bc962cc228e4516f8807c71dec799c68474e (patch) | |
| tree | fa1b8300fbd29e5f05cca119dcc18a61ac70fb47 /testsuite/merge.test | |
| parent | a6e7b97868097083337a39bb73070208d4556534 (diff) | |
| download | rsync-a9a8bc962cc228e4516f8807c71dec799c68474e.tar.gz | |
Got rid of the --no-ir kluge in this test.
Diffstat (limited to 'testsuite/merge.test')
| -rw-r--r-- | testsuite/merge.test | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/testsuite/merge.test b/testsuite/merge.test index e1d1fc1e..cd10a2aa 100644 --- 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 |