# 
# 
# rename "tests/t_merge_lca.at"
#     to "tests/t_merge_7.at"
# 
# patch "ChangeLog"
#  from [e81dd0d4e8af239001958e4e89ff91a3e10f24df]
#    to [6813c4e2d977ecd0f30a3d8c88b4fcbffc7a0415]
# 
# patch "tests/t_merge_7.at"
#  from [fdaef4c3722a1d3c3bfba25588baaf34d363c367]
#    to [ea2c0f0083d44f8bac81c9b9cb9875032c27e436]
# 
# patch "testsuite.at"
#  from [11651fc697f207d5c56c85cd21afb9c1381c0d4d]
#    to [de70ffe966befc2f5c8a0c5be72c499ff7536494]
# 
============================================================
--- ChangeLog	e81dd0d4e8af239001958e4e89ff91a3e10f24df
+++ ChangeLog	6813c4e2d977ecd0f30a3d8c88b4fcbffc7a0415
@@ -1,3 +1,9 @@
+2006-05-18  Matthew Gregan  <address@hidden>
+
+	* testsuite.at, t_merge_lca.at: Rename to t_merge_7.at, tweak
+	comments to reflect that this used to test --lca, but now is
+	simply another merge test.
+
 2006-05-18  Nathaniel Smith  <address@hidden>
 
 	* options.hh, app_state.cc, monotone.cc:
============================================================
--- tests/t_merge_lca.at	fdaef4c3722a1d3c3bfba25588baaf34d363c367
+++ tests/t_merge_7.at	ea2c0f0083d44f8bac81c9b9cb9875032c27e436
@@ -1,8 +1,9 @@
-AT_SETUP([merge --lca])
+AT_SETUP([test a merge 7])
 MTN_SETUP
 
-# --lca is a temporary workaround for 3-way merge suckiness.  So this
-# test should go away eventually.
+# this used to be a test for the --lca option to merge and propagate.
+# this option is no longer needed in 0.26, so has since been removed.
+# --lca was a temporary workaround for 3-way merge suckiness.
 
 # arguably the issue is now fixed with mark-merge. I've changed 
 # the test to do a successful merge of E and F, since, well,
@@ -48,7 +49,7 @@
 AT_CHECK(MTN update, [], [ignore], [ignore])
 E=`BASE_REVISION`
 
-AT_CHECK(MTN merge --lca, [], [ignore], [stderr])
+AT_CHECK(MTN merge, [], [ignore], [stderr])
 AT_CHECK(QGREP($A stderr), [1])
 AT_CHECK(QGREP($E stderr), [])
 AT_CHECK(QGREP($F stderr), [])
============================================================
--- testsuite.at	11651fc697f207d5c56c85cd21afb9c1381c0d4d
+++ testsuite.at	de70ffe966befc2f5c8a0c5be72c499ff7536494
@@ -809,7 +809,7 @@
 m4_include(tests/t_merge_add_rename_add.at)
 m4_include(tests/t_update_branch.at)
 m4_include(tests/t_commit_cancelled.at)
-m4_include(tests/t_merge_lca.at)
+m4_include(tests/t_merge_7.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)