Next step: allow protocol 30 to be used, but disallow the use

of incremental recursion.  If this still avoids the hanging, I
will need to try to track down how inc_recurse can deadlock.

diff --git a/testsuite/merge.test b/testsuite/merge.test
index 0f6704a..fdcace8 100644 (file)
--- a/testsuite/merge.test
+++ b/testsuite/merge.test
@@ -41,10 +41,10 @@ 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 --protocol=29 --existing -f 'exclude,! */' "$from1dir/" "$from2dir/"
-$RSYNC -av --protocol=29 --existing -f 'exclude,! */' "$from2dir/" "$from3dir/"
-$RSYNC -av --protocol=29 --existing -f 'exclude,! */' "$from1dir/" "$chkdir/"
-$RSYNC -av --protocol=29 --existing -f 'exclude,! */' "$from3dir/" "$chkdir/"
+$RSYNC -av --no-ir --existing -f 'exclude,! */' "$from1dir/" "$from2dir/"
+$RSYNC -av --no-ir --existing -f 'exclude,! */' "$from2dir/" "$from3dir/"
+$RSYNC -av --no-ir --existing -f 'exclude,! */' "$from1dir/" "$chkdir/"
+$RSYNC -av --no-ir --existing -f 'exclude,! */' "$from3dir/" "$chkdir/"
 
 checkit "$RSYNC -aHvv \"$from1dir/\" \"$from2dir/\" \"$from3dir/\" \"$todir/\"" "$chkdir" "$todir"