# 
# 
# patch "commands.cc"
#  from [11735720c7d776a2db4a1a0b9ea1f527ca7338c0]
#    to [76eddb1e6492f8832c3b0f27840378814654443c]
# 
# patch "roster.cc"
#  from [36c82f8488096e3c9b373204ae1096e4bec67316]
#    to [a24f36294033178c526b4428a3075365b570d716]
# 
# patch "tests/t_automate_get_manifest_of.at"
#  from [5bde4f916aed5f04d180fe05434058c5349b9c19]
#    to [5fa75c7b02e3999daf2970beda0db8ad7e6fe464]
# 
# patch "tests/t_restricted_diff_unchanged.at"
#  from [f8be24c54e0788373525f9a0c4986791be44b37c]
#    to [828a5f5d15254d097d76a6fac987d04cdcac4cfe]
# 
# patch "tests/t_restrictions.at"
#  from [388047932fc9c490f3534c41cb56fa7a32bd4a17]
#    to [b173ab929cea602b9926885a780e5581fdbff22c]
# 
# patch "tests/t_revert_move_to_renamed_dir.at"
#  from [4cfa1559e876f34bba6896963571c6896640c8bb]
#    to [54932389dc53d160ef3a327155b6e421e778611b]
# 
# patch "tests/t_status.at"
#  from [24af43c35484665f7819fa20c673c1b9f214518c]
#    to [45495e7ba852a410891f36c6f66c1d36712456fa]
# 
============================================================
--- commands.cc	11735720c7d776a2db4a1a0b9ea1f527ca7338c0
+++ commands.cc	76eddb1e6492f8832c3b0f27840378814654443c
@@ -1364,7 +1364,6 @@
   revision_id old_rev_id;
   revision_set rev;
   data tmp;
-  temp_node_id_source nis;
 
   app.require_workspace();
   get_base_and_current_roster_shape(old_roster, new_roster, app);
@@ -3705,13 +3704,7 @@
   if (app.revision_selectors.size() == 0)
     app.require_workspace("try passing a --revision to start at");
 
-  temp_node_id_source nis;
-
-  set<node_id> nodes;
-  
   set<revision_id> frontier;
-
-  set<revision_id> frontier;
   revision_id first_rid;
 
   if (app.revision_selectors.size() == 0)
============================================================
--- roster.cc	36c82f8488096e3c9b373204ae1096e4bec67316
+++ roster.cc	a24f36294033178c526b4428a3075365b570d716
@@ -2226,9 +2226,6 @@
       "or to handle all at once, simply 'monotone drop --missing'\n"
       "or 'monotone revert --missing'")
     % missing_files % app.prog_name % app.prog_name % app.prog_name);
-      "'monotone drop FILE' to remove it permanently, or\n"
-      "'monotone revert FILE' to restore it\n")
-    % missing_files);
 }
 
 void 
============================================================
--- tests/t_automate_get_manifest_of.at	5bde4f916aed5f04d180fe05434058c5349b9c19
+++ tests/t_automate_get_manifest_of.at	5fa75c7b02e3999daf2970beda0db8ad7e6fe464
@@ -53,7 +53,7 @@
 # check that modified working copy manifest is correct
 AT_DATA(foo, [bla bla
 ])        
-AT_CHECK(MONOTONE automate get_manifest_of, [], [stdout], [ignore])
+AT_CHECK(MTN automate get_manifest_of, [], [stdout], [ignore])
 AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(cmp expected2 stdout)
 
============================================================
--- tests/t_restricted_diff_unchanged.at	f8be24c54e0788373525f9a0c4986791be44b37c
+++ tests/t_restricted_diff_unchanged.at	828a5f5d15254d097d76a6fac987d04cdcac4cfe
@@ -1,11 +1,6 @@
 AT_SETUP([diff -rREV1 -rREV2 UNCHANGED-FILE])
 MTN_SETUP
 
-# This test is a bug report.  The problem appears to be in
-# calculated_restricted_change_set, as called by do_diffs; it passes a
-# very sparse valid_paths argument to app.set_restriction.
-AT_XFAIL_IF(true)
-
 ADD_FILE(testfile, [blah blah
 ])
 ADD_FILE(otherfile, [foo bar
@@ -18,15 +13,15 @@
 COMMIT(testbranch)
 R2=`BASE_REVISION`
 
-AT_CHECK(MONOTONE diff -r$R1 -r$R2 testfile, [], [stdout], [ignore])
+AT_CHECK(MTN diff -r$R1 -r$R2 testfile, [], [stdout], [ignore])
 AT_CHECK(grep 'no changes' stdout, [0], [ignore], [ignore])
 AT_CHECK(grep testfile  stdout, [1], [ignore], [ignore])
 AT_CHECK(grep otherfile stdout, [1], [ignore], [ignore])
 
-AT_CHECK(MONOTONE diff -r$R1 -r$R2, [], [stdout], [ignore])
+AT_CHECK(MTN diff -r$R1 -r$R2, [], [stdout], [ignore])
 AT_CHECK(grep testfile  stdout, [1], [ignore], [ignore])
 AT_CHECK(grep otherfile stdout, [0], [ignore], [ignore])
 
-AT_CHECK(MONOTONE diff -r$R1 -r$R2 badfile, [1], [ignore], [ignore])
+AT_CHECK(MTN diff -r$R1 -r$R2 badfile, [1], [ignore], [ignore])
 
 AT_CLEANUP
============================================================
--- tests/t_restrictions.at	388047932fc9c490f3534c41cb56fa7a32bd4a17
+++ tests/t_restrictions.at	b173ab929cea602b9926885a780e5581fdbff22c
@@ -49,7 +49,7 @@
 # FIXME_RESTRICTIONS: the old code allows for --depth=N with no paths
 # and adds the "." path so that depth is interpreted against the current
 # included directory. this seems bad. how does --depth interact with --exclude?
-#AT_CHECK(MONOTONE ls known --depth=0, [], [stdout], [ignore])
+#AT_CHECK(MTN ls known --depth=0, [], [stdout], [ignore])
 #AT_CHECK(grep fileX stdout, [1], [ignore])
 
 AT_CHECK(MTN ls known --depth=0 . , [], [stdout], [ignore])
============================================================
--- tests/t_revert_move_to_renamed_dir.at	4cfa1559e876f34bba6896963571c6896640c8bb
+++ tests/t_revert_move_to_renamed_dir.at	54932389dc53d160ef3a327155b6e421e778611b
@@ -1,11 +1,6 @@
 AT_SETUP([revert moving a file to a renamed directory])
 MTN_SETUP
 
-# this test is a bug report
-# see http://savannah.nongnu.org/bugs/?func=detailitem&item_id=15994
-
-AT_XFAIL_IF(true)
-
 ADD_FILE(file, [file
 ])
 
============================================================
--- tests/t_status.at	24af43c35484665f7819fa20c673c1b9f214518c
+++ tests/t_status.at	45495e7ba852a410891f36c6f66c1d36712456fa
@@ -60,7 +60,7 @@
 
 # restricted
 
-AT_CHECK(MONOTONE status from from_patched, [], [stdout], [ignore])
+AT_CHECK(MTN status from from_patched, [], [stdout], [ignore])
 AT_CHECK(grep '^delete "dropped"' stdout, [1], [ignore], [ignore])
 AT_CHECK(grep '^rename "from"' stdout, [], [ignore], [ignore])
 AT_CHECK(grep '^    to "to"' stdout, [], [ignore], [ignore])