# 
# add_file "tests/t_explicit_merge_with_anc.at"
# 
# patch "ChangeLog"
#  from [7a135636531bf1153f957be4d8ddd6cffaba3af4]
#    to [0087b8ab7e78fe6c92de53d7098293dfea3b8ea1]
# 
# patch "tests/t_explicit_merge_with_anc.at"
#  from []
#    to [c3dfbe2bd6c58997ffa5a037364b5cdad3b1891f]
# 
# patch "testsuite.at"
#  from [d9fe00c66d76bf6448f5113cc3bb51b7bd6f8d7b]
#    to [a3e066be498cff6ba295c3be4a9877c007e19aa3]
# 
========================================================================
--- ChangeLog	7a135636531bf1153f957be4d8ddd6cffaba3af4
+++ ChangeLog	0087b8ab7e78fe6c92de53d7098293dfea3b8ea1
@@ -1,5 +1,10 @@
 2005-08-15  Nathaniel Smith  <address@hidden>
 
+	* tests/t_explicit_merge_with_anc.at: New test.
+	* testsuite.at: Add it.
+
+2005-08-15  Nathaniel Smith  <address@hidden>
+
 	* tests/t_log_brief.at: New test.
 	* testsuite.at: Add it.
 
========================================================================
--- tests/t_explicit_merge_with_anc.at	
+++ tests/t_explicit_merge_with_anc.at	c3dfbe2bd6c58997ffa5a037364b5cdad3b1891f
@@ -0,0 +1,56 @@
+AT_SETUP([explicit_merge LEFT RIGHT ANC BRANCH])
+MONOTONE_SETUP
+
+ADD_FILE(testfile, [a
+OLD
+c
+d
+e
+])
+COMMIT(testbranch)
+BAD_ANC=`BASE_REVISION`
+
+SET_FILE(testfile, [a
+b
+c
+d
+e
+])
+COMMIT(testbranch)
+GOOD_ANC=`BASE_REVISION`
+
+SET_FILE(testfile, [a
+NEW
+c
+d
+e
+])
+COMMIT(testbranch)
+LEFT=`BASE_REVISION`
+
+REVERT_TO($GOOD_ANC)
+
+SET_FILE(testfile, [a
+b
+c
+NEW
+e
+])
+COMMIT(testbranch)
+RIGHT=`BASE_REVISION`
+
+# This should fail:
+AT_CHECK(MONOTONE explicit_merge $LEFT $RIGHT $BAD_ANC testbranch, [1], [ignore], [ignore])
+# But this should work:
+AT_CHECK(MONOTONE explicit_merge $LEFT $RIGHT $GOOD_ANC testbranch, [], [ignore], [ignore])
+# And produce the logical result:
+AT_CHECK(MONOTONE update, [], [ignore], [ignore])
+AT_DATA(expected, [a
+NEW
+c
+NEW
+e
+])
+AT_CHECK(cmp expected testfile)
+
+AT_CLEANUP
========================================================================
--- testsuite.at	d9fe00c66d76bf6448f5113cc3bb51b7bd6f8d7b
+++ testsuite.at	a3e066be498cff6ba295c3be4a9877c007e19aa3
@@ -693,3 +693,4 @@
 m4_include(tests/t_merge_lca.at)
 m4_include(tests/t_commit_log_writeback.at)
 m4_include(tests/t_log_brief.at)
+m4_include(tests/t_explicit_merge_with_anc.at)