#
#
# add_file "tests/automate_show_conflicts/expected-duplicate-name-multiple-name-missing-root.stdout"
#  content [b7fde67bcbe78d888f10a4b3822428ea9174fd43]
# 
# add_file "tests/automate_show_conflicts/expected-multiple-name-plus-directory-loop.stdout"
#  content [24a1e0c7dcbb1c1d23a5bc04769054208937fede]
# 
# add_file "tests/automate_show_conflicts/expected-multiple-name-plus-duplicate-name.stdout"
#  content [59ee31ea632cbde3652a8a99968ba989d9475cf5]
# 
# add_file "tests/automate_show_conflicts/expected-multiple-name-plus-orphan.stdout"
#  content [b2100ce320bca98a7e887ec9a2b45df390675652]
# 
# add_file "tests/automate_show_conflicts/expected-unrelated-projects.stdout"
#  content [798de4555bd1624f7883506ae21b0547acd3bfbd]
# 
# patch "tests/automate_show_conflicts/__driver__.lua"
#  from [ad6ea7ae925699a9a1e3be4339fa8a17078d5ae4]
#    to [d5373d214d4fa6ce9e622aae99ff03f23e5e433b]
#
============================================================
--- tests/automate_show_conflicts/expected-duplicate-name-multiple-name-missing-root.stdout	b7fde67bcbe78d888f10a4b3822428ea9174fd43
+++ tests/automate_show_conflicts/expected-duplicate-name-multiple-name-missing-root.stdout	b7fde67bcbe78d888f10a4b3822428ea9174fd43
@@ -0,0 +1,21 @@
+    left [254fd127afd769a33979a843f5e3d8f2457097e6]
+   right [6e0b7ffd0171d72db85dfc54234a78a35dd76cf3]
+ancestor [5bc669f00cf90b76dd38077827565b624d823756]
+
+conflict "missing root"
+
+     conflict "multiple names"
+    left_type "renamed directory"
+ancestor_name ""
+    left_name "aaa"
+   right_type "renamed directory"
+ancestor_name ""
+   right_name "bbb"
+
+     conflict "duplicate name"
+    left_type "renamed directory"
+ancestor_name "foo"
+    left_name ""
+   right_type "renamed directory"
+ancestor_name "bar"
+   right_name ""
============================================================
--- tests/automate_show_conflicts/expected-multiple-name-plus-directory-loop.stdout	24a1e0c7dcbb1c1d23a5bc04769054208937fede
+++ tests/automate_show_conflicts/expected-multiple-name-plus-directory-loop.stdout	24a1e0c7dcbb1c1d23a5bc04769054208937fede
@@ -0,0 +1,11 @@
+    left [4e25e44deef167f640248e542916736b649e3044]
+   right [0b37ed4689ee191cdd4bd26e5233511329b17032]
+ancestor [27169065f28ccfb64678ac168b3805796bd9e5ae]
+
+     conflict "multiple names"
+    left_type "renamed directory"
+ancestor_name "foo"
+    left_name "a/foo"
+   right_type "renamed directory"
+ancestor_name "foo"
+   right_name "b/foo"
============================================================
--- tests/automate_show_conflicts/expected-multiple-name-plus-duplicate-name.stdout	59ee31ea632cbde3652a8a99968ba989d9475cf5
+++ tests/automate_show_conflicts/expected-multiple-name-plus-duplicate-name.stdout	59ee31ea632cbde3652a8a99968ba989d9475cf5
@@ -0,0 +1,15 @@
+    left [424a7237e21522fd09878f486acbb8807cae59e6]
+   right [ef9b007adf6e49cc6b7e5317d860fb5716f418e9]
+ancestor [621e8ed86b46adcc57cd6abec90ecc41481a3e3b]
+
+        conflict "multiple names"
+       left_type "renamed file"
+   ancestor_name "foo"
+ancestor_file_id [eaf183d079563812d0c6860225ea9e4e0e2ebc20]
+       left_name "aaa"
+    left_file_id [eaf183d079563812d0c6860225ea9e4e0e2ebc20]
+      right_type "renamed file"
+   ancestor_name "foo"
+ancestor_file_id [eaf183d079563812d0c6860225ea9e4e0e2ebc20]
+      right_name "bbb"
+   right_file_id [eaf183d079563812d0c6860225ea9e4e0e2ebc20]
============================================================
--- tests/automate_show_conflicts/expected-multiple-name-plus-orphan.stdout	b2100ce320bca98a7e887ec9a2b45df390675652
+++ tests/automate_show_conflicts/expected-multiple-name-plus-orphan.stdout	b2100ce320bca98a7e887ec9a2b45df390675652
@@ -0,0 +1,15 @@
+    left [0c9b6d79dc8842d0440be2b10a8bf4015d1114b9]
+   right [894db59b5fe6bcc4a22cfc1e06e5865b2bd888b1]
+ancestor [e487f26d5c464b381743e394923b7fd44b00705e]
+
+        conflict "multiple names"
+       left_type "renamed file"
+   ancestor_name "foo"
+ancestor_file_id [f53efd5c0abb89e4c292f9c0e5709e0cd95aec4a]
+       left_name "a/foo"
+    left_file_id [f53efd5c0abb89e4c292f9c0e5709e0cd95aec4a]
+      right_type "renamed file"
+   ancestor_name "foo"
+ancestor_file_id [f53efd5c0abb89e4c292f9c0e5709e0cd95aec4a]
+      right_name "b/foo"
+   right_file_id [f53efd5c0abb89e4c292f9c0e5709e0cd95aec4a]
============================================================
--- tests/automate_show_conflicts/expected-unrelated-projects.stdout	798de4555bd1624f7883506ae21b0547acd3bfbd
+++ tests/automate_show_conflicts/expected-unrelated-projects.stdout	798de4555bd1624f7883506ae21b0547acd3bfbd
@@ -0,0 +1,11 @@
+    left [161e426c3b0c3f98d0be225f69d6f893ce8e0442]
+   right [0e3260f51acd1e98c40666557eb6c0eefeae5f02]
+ancestor []
+
+conflict "missing root"
+
+  conflict "duplicate name"
+ left_type "added directory"
+ left_name ""
+right_type "added directory"
+right_name ""
============================================================
--- tests/automate_show_conflicts/__driver__.lua	ad6ea7ae925699a9a1e3be4339fa8a17078d5ae4
+++ tests/automate_show_conflicts/__driver__.lua	d5373d214d4fa6ce9e622aae99ff03f23e5e433b
@@ -429,7 +429,7 @@ check(mtn("rm", "a"), 0, false, false)
 check(mtn("mv", "foo", "b"), 0, false, false)
 check(mtn("rm", "a"), 0, false, false)
 
--- this doesn't result in a directory loop conflict because the multiple name
+-- this doesn't result in an orphan conflict because the multiple name
 -- conflict prevents foo from being attached in the result roster
 
 create_second()
@@ -504,6 +504,7 @@ check(indir(dir2, mtn("pivot_root", "bar
 
 check(mtn("co", "--revision", base, "--branch", branch, dir2), 0, false, false)
 check(indir(dir2, mtn("pivot_root", "bar", "bbb")), 0, true, true)
+check(indir(dir2, mtn("commit", "--message", "commit")), 0, false, false)
 
 second = indir(dir2, {base_revision})[1]()