OK, "find ... -print0 | xargs -0 ..." wasn't portable. This is.

diff --git a/testsuite/merge.test b/testsuite/merge.test
index 3a195c4..36f83bc 100644 (file)
--- a/testsuite/merge.test
+++ b/testsuite/merge.test
@@ -43,7 +43,7 @@ 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
 cp -p "$from3dir"/sub2/subby "$chkdir"/sub2
 
 # Get rid of any directory-time differences

-find "$from1dir" "$from2dir" "$from3dir" "$chkdir" -type d -print0 | xargs -0 touch
+touch "$fromdir"? "$chkdir" "$fromdir"?/sub? "$chkdir"/sub?

 
 checkit "$RSYNC -aHvv \"$fromdir\"?/ \"$todir/\"" "$chkdir" "$todir"
 
 
 checkit "$RSYNC -aHvv \"$fromdir\"?/ \"$todir/\"" "$chkdir" "$todir"