From: Wayne Davison <wayned@samba.org>
Date: Thu, 26 Apr 2007 23:15:51 +0000 (+0000)
Subject: Got rid of the --no-ir kluge in this test.
X-Git-Tag: v3.0.0pre1~281
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9a8bc962cc228e4516f8807c71dec799c68474e;p=thirdparty%2Frsync.git

Got rid of the --no-ir kluge in this test.
---

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