#
#
# patch "cmd_merging.cc"
#  from [b38b867f654d55f49b0cf967c921f4180fa9e7d9]
#    to [80449dde5a191f4c79d41cfd249d67c9169c0b02]
# 
# patch "cmd_othervcs.cc"
#  from [3f891d529949dc55ec8e87ec81ca11919f6077e6]
#    to [74fc95188256ea7ab3d097e5539ade36714b3516]
# 
# patch "database.cc"
#  from [244233392b6b1ee174b300df6c855606b58b010f]
#    to [e0beb31f8ad013d450e60f5a62a061e70d57f867]
# 
# patch "database.hh"
#  from [b863d340028d584f572ec1fb9a48ee5ebffefb59]
#    to [55ac10d5301451efba3ffe2783481c2331b84867]
# 
# patch "database_check.cc"
#  from [57a798810a30a3af156599b55df65fce5967bf08]
#    to [488a21d3e8287b6a410253e220786c5475ec04c8]
# 
# patch "rcs_import.cc"
#  from [93b52aa3c730c65e46c5e62f4566a3f6478c80bb]
#    to [870c94e10d0fe381de733089be8c17343743e45d]
# 
# patch "revision.cc"
#  from [4ff3ab0f710c886b388cad55b498cfa7189c260f]
#    to [e29e571d3527b379a9bd4e4fd95e0a81741daa30]
# 
# patch "schema_migration.cc"
#  from [5cdc15083da2f750656c800c1b8a37fbedfb849b]
#    to [02864df785a7922842e3d31b855a605682b7c408]
# 
# patch "work_migration.cc"
#  from [cfc359b2ea7f152cbff71afd2a266c08b6ff539f]
#    to [1095917707d4db51c2b3e6782022c67500de89a1]
#
============================================================
--- cmd_merging.cc	b38b867f654d55f49b0cf967c921f4180fa9e7d9
+++ cmd_merging.cc	80449dde5a191f4c79d41cfd249d67c9169c0b02
@@ -437,7 +437,7 @@ CMD(propagate, N_("tree"), N_("SOURCE-BR
     throw usage(name);
   vector<utf8> a = args;
   a.push_back(utf8());
-  process(app, "merge_into_dir", a);
+  process(app, "merge-into-dir", a);
 }
 
 CMD(merge_into_dir, N_("tree"), N_("SOURCE-BRANCH DEST-BRANCH DIR"),
============================================================
--- cmd_othervcs.cc	3f891d529949dc55ec8e87ec81ca11919f6077e6
+++ cmd_othervcs.cc	74fc95188256ea7ab3d097e5539ade36714b3516
@@ -15,7 +15,7 @@ CMD(rcs_import, N_("debug"), N_("RCSFILE
 CMD(rcs_import, N_("debug"), N_("RCSFILE..."),
     N_("parse versions in RCS files\n"
        "this command doesn't reconstruct or import revisions."
-       "you probably want cvs_import"),
+       "you probably want cvs-import"),
     options::opts::branch)
 {
   if (args.size() < 1)
============================================================
--- database.cc	244233392b6b1ee174b300df6c855606b58b010f
+++ database.cc	e0beb31f8ad013d450e60f5a62a061e70d57f867
@@ -175,7 +175,7 @@ database::check_format()
       // Do we need to regenerate cached data?
       E(!have_revisions || (have_rosters && have_heights),
         F("database %s lacks some cached data\n"
-          "run '%s db regenerate_caches' to restore use of this database")
+          "run '%s db regenerate-caches' to restore use of this database")
         % filename % ui.prog_name);
     }
   else
@@ -2101,7 +2101,7 @@ database::delete_existing_heights()
 }
 
 /// Deletes one revision from the local database.
-/// @see kill_rev_locally
+/// @see kill-rev-locally
 void
 database::delete_existing_rev_and_certs(revision_id const & rid)
 {
============================================================
--- database.hh	b863d340028d584f572ec1fb9a48ee5ebffefb59
+++ database.hh	55ac10d5301451efba3ffe2783481c2331b84867
@@ -539,11 +539,11 @@ public:
   void version(std::ostream &);
   void migrate();
   void test_migration_step(std::string const &);
-  // for kill_rev_locally:
+  // for kill-rev-locally:
   void delete_existing_rev_and_certs(revision_id const & rid);
-  // for kill_branch_certs_locally:
+  // for kill-branch-certs-locally:
   void delete_branch_named(cert_value const & branch);
-  // for kill_tag_locally:
+  // for kill-tag-locally:
   void delete_tag_named(cert_value const & tag);
 
   // misc
@@ -583,7 +583,7 @@ public:
   void put_height_for_revision(revision_id const & new_id,
                                revision_t const & rev);
 
-  // for regenerate_rosters
+  // for regenerate-caches
   void delete_existing_rosters();
   void put_roster_for_revision(revision_id const & new_id,
                                revision_t const & rev);
============================================================
--- database_check.cc	57a798810a30a3af156599b55df65fce5967bf08
+++ database_check.cc	488a21d3e8287b6a410253e220786c5475ec04c8
@@ -248,7 +248,7 @@ check_rosters_marking(app_state & app,
           continue;
 
       // skip marking check on unreferenced rosters -- they're left by
-      // kill_rev_locally, and not expected to have everything they
+      // kill-rev-locally, and not expected to have everything they
       // reference existing
       if (!i->second.revision_refs)
         continue;
============================================================
--- rcs_import.cc	93b52aa3c730c65e46c5e62f4566a3f6478c80bb
+++ rcs_import.cc	870c94e10d0fe381de733089be8c17343743e45d
@@ -1207,7 +1207,7 @@ import_cvs_repo(system_path const & cvsr
 {
   N(!directory_exists(cvsroot / "CVSROOT"),
     F("%s appears to be a CVS repository root directory\n"
-      "try importing a module instead, with 'cvs_import %s/<module_name>")
+      "try importing a module instead, with 'cvs-import %s/<module_name>")
     % cvsroot % cvsroot);
 
   {
@@ -1298,7 +1298,7 @@ cluster_consumer::cluster_consumer(cvs_h
   if (!branch.live_at_beginning.empty())
     {
       cvs_author synthetic_author =
-        cvs.author_interner.intern("cvs_import");
+        cvs.author_interner.intern("cvs-import");
 
       cvs_changelog synthetic_cl =
         cvs.changelog_interner.intern("beginning of branch "
============================================================
--- revision.cc	4ff3ab0f710c886b388cad55b498cfa7189c260f
+++ revision.cc	e29e571d3527b379a9bd4e4fd95e0a81741daa30
@@ -1736,7 +1736,7 @@ build_changesets_from_manifest_ancestry(
 }
 
 
-// This is a special function solely for the use of regenerate_caches -- it
+// This is a special function solely for the use of regenerate-caches -- it
 // must work even when caches (especially, the height cache!) do not exist.
 // For all other purposes, use toposort above.
 static void
============================================================
--- schema_migration.cc	5cdc15083da2f750656c800c1b8a37fbedfb849b
+++ schema_migration.cc	02864df785a7922842e3d31b855a605682b7c408
@@ -999,7 +999,7 @@ migrate_sql_schema(sqlite3 * db, app_sta
       break;
     case upgrade_regen_caches:
       P(F("NOTE: this upgrade cleared monotone's caches\n"
-          "you should now run '%s db regenerate_caches'")
+          "you should now run '%s db regenerate-caches'")
         % ui.prog_name);
       break;
     case upgrade_none:
============================================================
--- work_migration.cc	cfc359b2ea7f152cbff71afd2a266c08b6ff539f
+++ work_migration.cc	1095917707d4db51c2b3e6782022c67500de89a1
@@ -124,7 +124,7 @@ workspace::check_ws_format()
   E(format >= current_workspace_format,
     F("to use this workspace with this version of monotone, its metadata\n"
       "must be migrated from format %d to format %d, using the command\n"
-      "'%s migrate_workspace'.\n"
+      "'%s migrate-workspace'.\n"
       "once you have done this, you will not be able to use the workspace\n"
       "with versions of monotone older than %s.")
     % format % current_workspace_format % ui.prog_name