# 
# 
# add_file "tests/t_merge_into_dir.at"
#  content [7c4cdfb3ef4fd2bbac8624cf2c8e8ce37da88412]
# 
# add_file "tests/t_show_conflicts.at"
#  content [22f141eceecb8fa87d0c8e46ccd165e4d9aae7d7]
# 
============================================================
--- tests/t_merge_into_dir.at	7c4cdfb3ef4fd2bbac8624cf2c8e8ce37da88412
+++ tests/t_merge_into_dir.at	7c4cdfb3ef4fd2bbac8624cf2c8e8ce37da88412
@@ -0,0 +1,28 @@
+AT_SETUP([merge a project into a subdirectory of an unrelated project])
+MONOTONE_SETUP
+
+AT_CHECK(cp -r MT MT.orig)
+ADD_FILE(file1, [foo
+])
+COMMIT(b1)
+
+AT_CHECK(rm -r MT)
+AT_CHECK(cp -r MT.orig MT)
+AT_CHECK(rm file1)
+ADD_FILE(file2, [bar
+])
+AT_CHECK(mkdir dir)
+ADD_FILE(dir/quux, [baz
+])
+COMMIT(b2)
+
+AT_CHECK(MONOTONE merge_into_dir b1 b2 dir/zuul, [], [ignore], [ignore])
+
+AT_CHECK(MONOTONE checkout -b b2 checkout)
+AT_CHECK(test -f checkout/file2)
+AT_CHECK(test -d checkout/dir)
+AT_CHECK(test -f checkout/dir/quux)
+AT_CHECK(test -d checkout/dir/zuul)
+AT_CHECK(test -f checkout/dir/zuul/file1)
+
+AT_CLEANUP
============================================================
--- tests/t_show_conflicts.at	22f141eceecb8fa87d0c8e46ccd165e4d9aae7d7
+++ tests/t_show_conflicts.at	22f141eceecb8fa87d0c8e46ccd165e4d9aae7d7
@@ -0,0 +1,32 @@
+AT_SETUP([show_conflicts])
+MONOTONE_SETUP
+
+ADD_FILE(foo, [file foo
+])
+ADD_FILE(bar, [file bar
+])
+COMMIT(branch)
+BASE=`BASE_REVISION`
+
+AT_CHECK(MONOTONE mv -e foo baz, [], [ignore], [ignore])
+AT_CHECK(echo xxx >>bar)
+COMMIT(branch)
+LEFT=`BASE_REVISION`
+
+AT_CHECK(MONOTONE update -r $BASE, [], [ignore], [ignore])
+AT_CHECK(MONOTONE mv -e foo quux, [], [ignore], [ignore])
+AT_CHECK(echo yyy >>bar)
+COMMIT(branch)
+RIGHT=`BASE_REVISION`
+
+AT_CHECK(MONOTONE show_conflicts $LEFT $RIGHT, [], [ignore], [stderr])
+AT_CHECK(mv stderr conflicts)
+
+AT_CHECK(QGREP("There are 1 node_name_conflicts" conflicts))
+AT_CHECK(QGREP("There are 1 file_content_conflicts" conflicts))
+AT_CHECK(QGREP("There are 0 node_attr_conflicts" conflicts))
+AT_CHECK(QGREP("There are 0 orphaned_node_conflicts" conflicts))
+AT_CHECK(QGREP("There are 0 rename_target_conflicts" conflicts))
+AT_CHECK(QGREP("There are 0 directory_loop_conflicts" conflicts))
+
+AT_CLEANUP