# 
# add_file "tests/t_merge_add_rename_add.at"
# 
# patch "ChangeLog"
#  from [5ed0ea72fb56615cc9edbe8966bbbe219bc587c0]
#    to [88f9faae34d162858a68009a3367808c1fb3abde]
# 
# patch "tests/t_merge_add_del.at"
#  from [82df57eb4cca39c60859158ff1dca16c0ee4f557]
#    to [20f850e8ede0f7c4240c1f9cb21855f151f89df2]
# 
# patch "tests/t_merge_add_rename_add.at"
#  from []
#    to [65aee8363a38ca7e1ba54d2d691725867c0e46e4]
# 
# patch "testsuite.at"
#  from [97222f8297b2c402e778b69ac58ddb8600923b47]
#    to [4a0d9ae563d1ae50076ebb7fcaca958acb31dbad]
# 
===============================================
--- ChangeLog	5ed0ea72fb56615cc9edbe8966bbbe219bc587c0
+++ ChangeLog	88f9faae34d162858a68009a3367808c1fb3abde
@@ -1,3 +1,10 @@
+2005-07-27  Matthew Gregan  <address@hidden>
+
+	* tests/t_merge_add_del.at: 'drop' does not take a branch (test
+	now fails in expected place).
+	* tests/t_merge_add_rename_add.at: New test.
+	* testsuite.at: Add it.
+
 2005-07-26  Richard Levitte  <address@hidden>
 
 	* revision.cc (check_sane_history): Convert tabs to the
===============================================
--- tests/t_merge_add_del.at	82df57eb4cca39c60859158ff1dca16c0ee4f557
+++ tests/t_merge_add_del.at	20f850e8ede0f7c4240c1f9cb21855f151f89df2
@@ -56,7 +56,7 @@
 
 # produce state E
 REVERT_TO($C_REVISION_SHA,branch.main)
-AT_CHECK(MONOTONE --branch=branch.main drop bar, [], [ignore], [ignore])
+AT_CHECK(MONOTONE drop bar, [], [ignore], [ignore])
 AT_CHECK(MONOTONE --branch=branch.main commit --message 'state E - drop bar', [], [ignore], [ignore])
 E_REVISION_SHA=`BASE_REVISION`
 
===============================================
--- tests/t_merge_add_rename_add.at	
+++ tests/t_merge_add_rename_add.at	65aee8363a38ca7e1ba54d2d691725867c0e46e4
@@ -0,0 +1,48 @@
+#  -*- Autoconf -*-
+
+AT_SETUP([merging <add a, rename a b> with <add b>])
+
+# This test is a bug report.
+AT_XFAIL_IF(true)
+
+MONOTONE_SETUP
+
+#              A
+#            /   \
+#           B     C
+#            \   /
+#              D
+#
+# A is the common ancestor, containing 'add foo'.  B contains 'rename foo
+# bar'.  C contains 'add bar'.  D is the final state after a merge--we
+# currently don't have a definition for what this final state is.
+
+AT_DATA(foo, [extra blah blah foo
+])
+AT_DATA(bar, [extra blah blah bar
+])
+
+# produce state A
+AT_CHECK(MONOTONE add foo, [], [ignore], [ignore])
+AT_CHECK(MONOTONE --branch=branch.main commit --message 'state A - add foo', [], [ignore], [ignore])
+A_REVISION_SHA=`BASE_REVISION`
+
+# produce state B
+AT_CHECK(MONOTONE rename foo bar, [], [ignore], [ignore])
+AT_CHECK(mv foo bar, [], [ignore], [ignore])
+AT_CHECK(MONOTONE --branch=branch.main commit --message 'state B - rename foo bar', [], [ignore], [ignore])
+B_REVISION_SHA=`BASE_REVISION`
+
+# produce state C
+REVERT_TO($A_REVISION_SHA)
+AT_CHECK(MONOTONE add bar, [], [ignore], [ignore])
+AT_CHECK(MONOTONE --branch=branch.main commit --message 'state C - add bar', [], [ignore], [ignore])
+C_REVISION_SHA=`BASE_REVISION`
+
+# merge heads to make D
+AT_CHECK(MONOTONE --branch=branch.main merge, [], [ignore], [ignore])
+
+# XXX: once the final state has a real definition inside monotone, we need
+# to add checks here to ensure that state has been reached.
+
+AT_CLEANUP
===============================================
--- testsuite.at	97222f8297b2c402e778b69ac58ddb8600923b47
+++ testsuite.at	4a0d9ae563d1ae50076ebb7fcaca958acb31dbad
@@ -678,3 +678,4 @@
 m4_include(tests/t_ls_branches.at)
 m4_include(tests/t_database_check_normalized.at)
 m4_include(tests/t_annotate_no_rev.at)
+m4_include(tests/t_merge_add_rename_add.at)