# 
# patch "commands.cc"
#  from [e8ab0db3e3da815d6b9190ef8a91f57c84cb91eb]
#    to [dc0519cf35f54c97c826e88230294cb813d5d923]
# 
# patch "tests/t_status.at"
#  from [0b361ba1ed3579bcd794fb3edd21a881f4a46e23]
#    to [13e9e62d33cf4e02f5970d5d92131db1caadb34a]
# 
========================================================================
--- commands.cc	e8ab0db3e3da815d6b9190ef8a91f57c84cb91eb
+++ commands.cc	dc0519cf35f54c97c826e88230294cb813d5d923
@@ -3105,8 +3105,6 @@
   maybe_update_inodeprints(app);
 }
 
-/*
-// FIXME_ROSTERS: disabled until rewritten to use rosters
 CMD(explicit_merge, N_("tree"),
     N_("LEFT-REVISION RIGHT-REVISION DEST-BRANCH\n"
       "LEFT-REVISION RIGHT-REVISION COMMON-ANCESTOR DEST-BRANCH"),
@@ -3148,7 +3146,7 @@
 
   revision_id merged;
   transaction_guard guard(app.db);
-  try_one_merge(left, right, ancestor, merged, app);
+  interactive_merge_and_store(left, right, merged, app);
   
   packet_db_writer dbw(app);
   
@@ -3222,8 +3220,6 @@
     throw usage(name);  
 }
 
-*/
-
 CMD(revert, N_("working copy"), N_("[PATH]..."), 
     N_("revert file(s), dir(s) or entire working copy"), OPT_DEPTH % OPT_EXCLUDE % OPT_MISSING)
 {
========================================================================
--- tests/t_status.at	0b361ba1ed3579bcd794fb3edd21a881f4a46e23
+++ tests/t_status.at	13e9e62d33cf4e02f5970d5d92131db1caadb34a
@@ -39,13 +39,12 @@
 AT_CHECK(MONOTONE rename from_patched to_patched, [], [ignore], [ignore])
 
 AT_CHECK(MONOTONE status, [], [stdout], [ignore])
-AT_CHECK(grep '^delete_file "dropped"' stdout, [], [ignore], [ignore])
-AT_CHECK(grep '^rename_file "from"' stdout, [], [ignore], [ignore])
-AT_CHECK(grep '^         to "to"' stdout, [], [ignore], [ignore])
-AT_CHECK(grep '^rename_file "from_patched"' stdout, [], [ignore], [ignore])
-AT_CHECK(grep '^         to "to_patched"' stdout, [], [ignore], [ignore])
+AT_CHECK(grep '^delete "dropped"' stdout, [], [ignore], [ignore])
+AT_CHECK(grep '^rename "from"' stdout, [], [ignore], [ignore])
+AT_CHECK(grep '^    to "to"' stdout, [], [ignore], [ignore])
+AT_CHECK(grep '^rename "from_patched"' stdout, [], [ignore], [ignore])
+AT_CHECK(grep '^    to "to_patched"' stdout, [], [ignore], [ignore])
 AT_CHECK(grep '^add_file "added"' stdout, [], [ignore], [ignore])
-AT_CHECK(grep '^patch "added"' stdout, [], [ignore], [ignore])
 AT_CHECK(grep '^patch "patched"' stdout, [], [ignore], [ignore])
 AT_CHECK(grep '^patch "to_patched"' stdout, [], [ignore], [ignore])
 
@@ -56,7 +55,6 @@
 AT_CHECK(grep '^renamed from_patched' stdout, [], [ignore], [ignore])
 AT_CHECK(grep '^     to to_patched' stdout, [], [ignore], [ignore])
 AT_CHECK(grep '^added   added' stdout, [], [ignore], [ignore])
-AT_CHECK(grep '^patched added' stdout, [1], [ignore], [ignore])
 AT_CHECK(grep '^patched patched' stdout, [], [ignore], [ignore])
 AT_CHECK(grep '^patched to_patched' stdout, [], [ignore], [ignore])