X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4571df58c6447337d564b409a866cad38a85a691..fe1c19dcdfa000c2461e85ed7bf712de49904377:/testsuite/merge.test

diff --git a/testsuite/merge.test b/testsuite/merge.test
index 1dddf630..b4b3dafa 100644
--- a/testsuite/merge.test
+++ b/testsuite/merge.test
@@ -19,8 +19,8 @@ from3dir="${fromdir}3"
 
 mkdir "$from1dir" "$from2dir" "$from3dir"
 mkdir "$from2dir"/sub1 "$from3dir"/sub1
-mkdir "$from3dir"/sub2
-mkdir "$chkdir" "$chkdir"/sub1 "$chkdir"/sub2
+mkdir "$from3dir"/sub2 "$from1dir"/dir-and-not-dir
+mkdir "$chkdir" "$chkdir"/sub1 "$chkdir"/sub2 "$chkdir"/dir-and-not-dir
 echo "one" >"$from1dir"/one
 cp -p "$from1dir"/one "$from2dir"/one
 cp -p "$from1dir"/one "$from3dir"/one
@@ -34,15 +34,18 @@ cp -p "$from2dir"/sub1/uno "$from3dir"/sub1/uno
 echo "sub2" >"$from3dir"/sub1/dos
 echo "sub3" >"$from2dir"/sub1/tres
 echo "subby" >"$from3dir"/sub2/subby
+echo "extra" >"$from1dir"/dir-and-not-dir/inside
+echo "not-dir" >"$from3dir"/dir-and-not-dir
 
 cp -p "$from1dir"/one "$from1dir"/two "$from2dir"/three "$from3dir"/four "$from1dir"/five "$from3dir"/six "$chkdir"
+cp -p "$from1dir"/dir-and-not-dir/inside "$chkdir"/dir-and-not-dir
 cp -p "$from2dir"/sub1/uno "$from3dir"/sub1/dos "$from2dir"/sub1/tres "$chkdir"/sub1
 cp -p "$from3dir"/sub2/subby "$chkdir"/sub2
 
 # Get rid of any directory-time differences
 touch "$from1dir" "$from2dir" "$from3dir" \
-    "$from2dir"/sub1 "$from3dir"/sub1 "$from3dir"/sub2 \
-    "$chkdir" "$chkdir"/sub1 "$chkdir"/sub2
+    "$from1dir"/dir-and-not-dir "$from2dir"/sub1 "$from3dir"/sub1 "$from3dir"/sub2 \
+    "$chkdir" "$chkdir"/dir-and-not-dir "$chkdir"/sub1 "$chkdir"/sub2
 
 checkit "$RSYNC -aHvv \"$from1dir/\" \"$from2dir/\" \"$from3dir/\" \"$todir/\"" "$chkdir" "$todir"