#
#
# patch "tests/_MTN_case-folding_security_patch/__driver__.lua"
#  from [2ed48a126f4f597050edc0ae0d3dea6ab264327b]
#    to [f6da42f1ee1d4511aec04632579e2943720716f7]
# 
# patch "tests/a_tricky_cvs_repository_with_tags/__driver__.lua"
#  from [d3631953afd2ee9a2000dd55d31537b7263be0eb]
#    to [ea2aa950747a3455acbaaf0b68a109e4d5b1fb10]
# 
# patch "tests/common/automate_ancestry.lua"
#  from [e63c51355db5f8979cb41cd5da88c8d577a6f47c]
#    to [0ca90997a2c9541897091ab8012f67717d11e465]
# 
# patch "tests/cvs_import,_deleted_file_invariant/__driver__.lua"
#  from [77d5fb4f5a6906811c692c23d808bb4b73e5b0d8]
#    to [629c535ba531319cc2c753bb3a47dcd68620c29a]
# 
# patch "tests/cvs_import,_file_dead_on_head_and_branch/__driver__.lua"
#  from [11d555c9da804144b970ddd92332b350b8ee5611]
#    to [0a173ba2bee1798360a7bf0bcc67c0d0fca10435]
# 
# patch "tests/cvs_import_with_file_added_on_a_branch/__driver__.lua"
#  from [d0e6597708af820827e6b7337fdfd5f3783f3b8f]
#    to [d3cb5b63751fae467ebb7f8d462e3770e2766616]
# 
# patch "tests/db_data_format_checking/__driver__.lua"
#  from [e3f5be2451252d0c52a609f638c402ac8a9cf302]
#    to [4154cdc004fe386e1b802045a527eaa0c3fb2bda]
# 
# patch "tests/db_kill_branch_certs_locally_command/__driver__.lua"
#  from [f7fbe9521eb4e0043364af4c15c44984078d0a9e]
#    to [af6f94b04b8c03a062bca436bbce1c2ea9a6cf9a]
# 
# patch "tests/db_kill_rev_and_recommit/__driver__.lua"
#  from [dd0ee3ba4f8f41948b81a2beeb1ce51020feb03f]
#    to [47639901ec4b07d973e980fefd3677f690762a20]
# 
# patch "tests/db_kill_rev_locally_command/__driver__.lua"
#  from [7e7b3aa9e42792245a60745ca257ac29f4d57b0c]
#    to [c68c10b29c3bf9924719a1ebd32f60ecf9792ce1]
# 
# patch "tests/db_kill_rev_locally_command_2/__driver__.lua"
#  from [328a569a373fa17abb515aad284828a541f0273a]
#    to [62422371bf94080ba4340271029712bdca7cb74d]
# 
# patch "tests/db_kill_tag_locally/__driver__.lua"
#  from [eb96c1472d7ef266ce84d3fcfb4beb75b3c57661]
#    to [3f57dec2d2885af6f1a774dacb8d2f3099d9f76e]
# 
# patch "tests/explicit_merge/__driver__.lua"
#  from [f75cba25216866f6e93ff681879c98835ff20a40]
#    to [4fbde2c892fdc280c14ab5f4765b3b0e4adcdc58]
# 
# patch "tests/explicit_merge_LEFT_RIGHT_ANC_BRANCH/__driver__.lua"
#  from [01d988717d007d6dbe2fd3d06a973237dc252f46]
#    to [03e6a505ee5ccf83988a7bc7032b7d36403a3b1d]
# 
# patch "tests/importing_a_cvs_file_with_one_version/__driver__.lua"
#  from [0de6fa65f177b1e770e82c70a42e5d9ddf844a20]
#    to [dc137506ce4033c0f267f0d60e54abbaf5c32e81]
# 
# patch "tests/importing_a_small,_real_cvs_repository/__driver__.lua"
#  from [4e160d1e01a68084cd29f0603443046e32867bef]
#    to [b366ee3903f5da652ebbdcc9687e716a14faf963]
# 
# patch "tests/importing_cvs_branches_with_correct_ancestory/__driver__.lua"
#  from [d631fce5fc35c3cbc4f0fcd8fa2967f1747063fe]
#    to [ad9d246eccd7e3212d160efa258543379ae43255]
# 
# patch "tests/importing_cvs_files/__driver__.lua"
#  from [0312cfcedd5ac67a6eba6580b93f4526eb955efd]
#    to [4e4b274ff401d24e0ed1038e44d2f383977ad7d8]
# 
# patch "tests/importing_cvs_files_with_identical_logs/__driver__.lua"
#  from [c96c35bf4d237bb60787fa0b5ca2bcb32a40fc8e]
#    to [9f5cf348cf75c8ef0a32abd22d772e82068afee6]
# 
# patch "tests/importing_cvs_with_vendor_imports_and_branches/__driver__.lua"
#  from [336b66cb2d6203748dfc1f1acb85346354288d9c]
#    to [0dff86be69b3e4e630548738b3822ee5c92c363c]
# 
# patch "tests/inodeprints/__driver__.lua"
#  from [1fa3521e195de0dbfd8af44f6c0fe5925ee10242]
#    to [6e4e49b4da9b78e7bb130a135da9a057e3b12b58]
# 
# patch "tests/ls_epochs/__driver__.lua"
#  from [44903563c5c09b46495d1913003634b558dd7e2b]
#    to [40174897c1c97b073a84088bbd5bd6a95245af7f]
# 
# patch "tests/merge_a_project_into_a_subdirectory_of_an_unrelated_project/__driver__.lua"
#  from [b40636cde4c94c2ce63862e36f398a7bf6a6b644]
#    to [cf3c4cf5e2a062351262f44aa95a912936837916]
# 
# patch "tests/merge_conflict_with_no_lca/__driver__.lua"
#  from [024b58c36ab28c05edd9e308451863c3ae3852be]
#    to [00ae76ae73416d02a6f4cb0b2ba32eda7852c846]
# 
# patch "tests/merge_into_workspace/__driver__.lua"
#  from [eff4b2a9a9871f5086b302176397d983e6590c54]
#    to [9ddcf96909adfaceec5d57cefe25fafb4d0b7148]
# 
# patch "tests/merge_into_workspace_attr_corpse/__driver__.lua"
#  from [7f01da1af5eedec9debf4f2d8f1dd7ec14561dcf]
#    to [c8a9049598cef180a05effb1e33a02ad3efabbea]
# 
# patch "tests/merge_into_workspace_files_added/__driver__.lua"
#  from [e09ec5adbbdd7e60dc85d72fbbb8029152a9cce3]
#    to [915e06047deb09fabf1b156352c2ceb12837ea51]
# 
# patch "tests/merge_into_workspace_no_changes/__driver__.lua"
#  from [26e56364aa09b4406a2b0c33a519649b61423f74]
#    to [b26e7d70671079636d4ee7082655f60bd210df13]
# 
# patch "tests/merge_into_workspace_same_rev/__driver__.lua"
#  from [990798ba737451deac9b7414bd742bfea3f4ecf1]
#    to [90facc7ea8ba0208eff721ad1797275a1cb5ccd9]
# 
# patch "tests/merge_rev_with_ancestor/__driver__.lua"
#  from [7a11b3b2570698ef3120a296899ed9876d0b7720]
#    to [0627a6ccf4f523cd47d42410c623d4b49aa55c6d]
# 
# patch "tests/migrate_workspace/__driver__.lua"
#  from [276c6f7ad3766a9ca513b1b5074120d9de987b2c]
#    to [bb1a48fdf18e85e139a1f39aed183c6ad0a46a80]
# 
# patch "tests/netsync_client_absorbs_and_checks_epochs/__driver__.lua"
#  from [c9ca91058a28985d1e07fba47cc85181580f2a41]
#    to [b71b98c81d97d8a54a240ab0bf3ffa5457ba8137]
# 
# patch "tests/netsync_epoch_refinement/__driver__.lua"
#  from [4ed9c46f6864a2c19cb69af2e4126bfe787d1c2c]
#    to [223a9a8854c1a4f24272fc492b1559e6a8978165]
# 
# patch "tests/netsync_hook_errcodes/__driver__.lua"
#  from [1e4504885124bfa64eeb91ce357c3a8f4820a94b]
#    to [752483f66dd0b8df4eed6367c16b9d15a3fa1060]
# 
# patch "tests/netsync_server_absorbs_and_checks_epochs/__driver__.lua"
#  from [cc83b2b114c4065c65f166c731e7b9090892bf83]
#    to [84376958352a4c5ab71ececd3e5e7d8434e9da87]
# 
# patch "tests/one-way_netsync_where_the_sink_has_more_epochs/__driver__.lua"
#  from [bb8e382b933199a1949323f0d4005db68b6d17bf]
#    to [581d113937bf0b9bfbd859cb99fe69e8449fe940]
# 
# patch "tests/pivot_root/__driver__.lua"
#  from [74d3f9a78052165a356b5958f1119f2309038a4c]
#    to [4fe26f9776c449f851e031a84ac32b97b9dff813]
# 
# patch "tests/pivot_root_to_new_dir/__driver__.lua"
#  from [1aced95b97d46debcd4087b1624980c159de369f]
#    to [5567deac032449f1b5d454228f21e1fe6c86429c]
# 
# patch "tests/pluck_lifecycle/__driver__.lua"
#  from [9108772eb30390339e6e827295af01751a471562]
#    to [1f4175dd825bd3fa30d7230cf550abf4dfe34936]
# 
# patch "tests/refresh_inodeprints/__driver__.lua"
#  from [c258a2f89893ea52c5f2ca862afbeb73991d76d3]
#    to [37f95d9e0e8080f687da73f8653d0556b10eac40]
# 
# patch "tests/restricted_commit_with_inodeprints/__driver__.lua"
#  from [b11b4fbd4ed1b88ccb61d2b9ea5347c61a360c47]
#    to [2939405aa7347949a7a08a230e7ee179237e3181]
# 
# patch "tests/reverting_a_pivot_root/__driver__.lua"
#  from [36d99a86c367367863e36a2af9d0911543d074f6]
#    to [759d883af4cf540de59766267510b68a7f8e0278]
# 
# patch "tests/schema_migration/__driver__.lua"
#  from [d708709c691b1536d54702969a8ffbffd5fa3c5f]
#    to [faf35d059cd73f5fdf1f842a3a784866c5a725d1]
# 
# patch "tests/schema_migration_error_recovery/__driver__.lua"
#  from [a4b51f336dff083ec53c2199d398f8edb90da941]
#    to [ddc8fcc8f7cc594e6237af9f36c4c3d70090b98a]
# 
# patch "tests/show_conflicts/__driver__.lua"
#  from [4cc6d804eb657c20e67c5bf3ebf6bfd2a0f9b20d]
#    to [a65e584428d5e3ee071a0639c9d669167a5837c2]
# 
# patch "tests/ssh_agent/__driver__.lua"
#  from [30ecccfbc733d168397e221984aaa41a114b7b17]
#    to [663042633f5dab8065d49cc28c57d33906611c47]
# 
# patch "tests/test_a_merge_7/__driver__.lua"
#  from [7811dc728183fe9b01fc68dcef994e87865d72ea]
#    to [219767be3bdc7c2b47adec31ef7a0b17573430aa]
# 
# patch "tests/test_problematic_cvs_import/__driver__.lua"
#  from [6340ee26326384bd4cff3b58bab4330aa4edc777]
#    to [71ef4c4bf99f6d52ec9c4746fc556ea56699c151]
# 
# patch "tests/two_parent_workspace_add_drop_rename/__driver__.lua"
#  from [f2edf6e4783c744259d791f4452fdabd211451e6]
#    to [0a140a1c43fd46255dce87e7976c6b16d40e86a1]
# 
# patch "tests/two_parent_workspace_annotate/__driver__.lua"
#  from [6cf020efb5377b79641fb655923731702df6c318]
#    to [e9e6bb4046bcdd5f6b3962f5b54a2a1c65f4f3d7]
# 
# patch "tests/two_parent_workspace_attrs/__driver__.lua"
#  from [abe04ad8bfd544146962c1280b976f5a0c5602d9]
#    to [01b4ec344afdf758eb392379eac42350bf550ab2]
# 
# patch "tests/two_parent_workspace_commands_that_fail/__driver__.lua"
#  from [ddb96c7133077b7166f21a65ad3d7e6bd97da49a]
#    to [958107be7f1f4028fe565e95e2a33dcb48183ec3]
# 
# patch "tests/two_parent_workspace_inodeprint_from_birth/__driver__.lua"
#  from [a9e6bc3f44cd5e115d22ab4c6616a50471bbb230]
#    to [dc9c693e6c4111629d2b6c199ff2e75046a9d870]
# 
# patch "tests/two_parent_workspace_inodeprints/__driver__.lua"
#  from [cb9175dd15771248cc7d53864fa77c17b9d09802]
#    to [d4c713ab7b54a3b9cfd7e9a5ba4c812409a34389]
# 
# patch "tests/two_parent_workspace_list/__driver__.lua"
#  from [65c50373573076490512bf8852e35bb671f34ff7]
#    to [5729fad7e2f95f880f2440a81d61af1ddc5d7827]
# 
# patch "tests/two_parent_workspace_pivot_root/__driver__.lua"
#  from [4cd99ef70412ee23cc86fcd2b6dce7a2c49c2bb0]
#    to [33c7699201b2a1e49302f3fbb05c91252cee3495]
# 
# patch "tests/two_parent_workspace_pluck/__driver__.lua"
#  from [d07e8989375d64c19851c241c7c01cb0a045c5c8]
#    to [f6309ae3a7a2a0cccbc94f57d0765515a8f4cda1]
# 
# patch "tests/unnormalized_paths_in_database/__driver__.lua"
#  from [cdf29f521361c390732d47de1b64b45c167c8775]
#    to [41f1471c0a3b54937770ee96a714389b68f3ccad]
# 
# patch "tests/update_to_off-branch_rev/__driver__.lua"
#  from [09660e5a0d63ff6671afc6a288be58071beecd2e]
#    to [1e0ebced2bd532c2636beab195111697465b6890]
# 
# patch "tests/updating_through_a_pivot_root/__driver__.lua"
#  from [aab50af65ba043424b85556957569396cf687c23]
#    to [ab50fe4f8fa367f5e67414a5f5e9602ac6f11eee]
# 
# patch "tests/use_restrictions_with_--exclude_and_inodeprints/__driver__.lua"
#  from [ccfd460757c86f23e4655058be414358602f1aec]
#    to [bbf44905e1eaf0038566ee24a1f12710f2db93f1]
# 
# patch "tests/workspace_migration/__driver__.lua"
#  from [e3b4942919d5e99c74ae0098986fa216d780bf40]
#    to [bd92f0d04e7dc3d02dd90ae7c6a614de340bbd5d]
# 
# patch "tests/workspace_migration/inodeprints.lua"
#  from [57960c6f4766c6ed3cad53c6436f4922d7c75895]
#    to [f2575c8d9d5489e35819f9af591ba92be647f9f2]
# 
# patch "tests/workspace_migration/twoparent.lua"
#  from [581c3f3571a87e4d2ab8d43f204974f31ee6c425]
#    to [23ec7ed6968004f410334bf6a2c8883d4a575701]
# 
# patch "testsuite.lua"
#  from [30b370324e7794c693af1e36ee7360e348a3a868]
#    to [98594f05af050a79f9a2665a99d077648a0c4e77]
#
============================================================
--- tests/_MTN_case-folding_security_patch/__driver__.lua	2ed48a126f4f597050edc0ae0d3dea6ab264327b
+++ tests/_MTN_case-folding_security_patch/__driver__.lua	f6da42f1ee1d4511aec04632579e2943720716f7
@@ -62,5 +62,5 @@ for _,i in pairs({"files", "dirs"}) do
   get(i..".db.dumped", "stdin")
   check(mtn("db", "load", "-d", i..".mtn"), 0, false, false, true)
   check(mtn("db", "migrate", "-d", i..".mtn"), 0, false, false)
-  check(mtn("-d", i..".mtn", "db", "regenerate_caches"), 3, false, false)
+  check(mtn("-d", i..".mtn", "db", "regenerate-caches"), 3, false, false)
 end
============================================================
--- tests/a_tricky_cvs_repository_with_tags/__driver__.lua	d3631953afd2ee9a2000dd55d31537b7263be0eb
+++ tests/a_tricky_cvs_repository_with_tags/__driver__.lua	ea2aa950747a3455acbaaf0b68a109e4d5b1fb10
@@ -7,7 +7,7 @@ check(get("cvs-repository"))
 
 check(get("cvs-repository"))
 
-check(mtn("--branch=foo.bar", "cvs_import", "cvs-repository"), 0, false, false)
+check(mtn("--branch=foo.bar", "cvs-import", "cvs-repository"), 0, false, false)
 check(mtn("--branch=foo.bar", "checkout"), 0, false, true)
 check(indir("foo.bar", mtn("automate", "get_manifest_of")), 0, true)
 canonicalize("stdout")
============================================================
--- tests/common/automate_ancestry.lua	e63c51355db5f8979cb41cd5da88c8d577a6f47c
+++ tests/common/automate_ancestry.lua	0ca90997a2c9541897091ab8012f67717d11e465
@@ -25,7 +25,7 @@ function make_graph()
   commit()
   revs.e = base_revision()
 
-  check(mtn("explicit_merge", revs.d, revs.e, "testbranch"), 0, false, false)
+  check(mtn("explicit-merge", revs.d, revs.e, "testbranch"), 0, false, false)
   check(mtn("update"), 0, false, false)
   revs.f = base_revision()
 
============================================================
--- tests/cvs_import,_deleted_file_invariant/__driver__.lua	77d5fb4f5a6906811c692c23d808bb4b73e5b0d8
+++ tests/cvs_import,_deleted_file_invariant/__driver__.lua	629c535ba531319cc2c753bb3a47dcd68620c29a
@@ -13,7 +13,7 @@ tsha2 = sha1("cfile")
 tsha2 = sha1("cfile")
 
 -- import into monotone and check presence of files
-check(mtn("--branch=testbranch", "cvs_import", "cvs-repository/test"), 0, false, false)
+check(mtn("--branch=testbranch", "cvs-import", "cvs-repository/test"), 0, false, false)
 
 check(mtn("automate", "get_file", tsha0), 0, false)
 check(mtn("automate", "get_file", tsha1), 0, false)
============================================================
--- tests/cvs_import,_file_dead_on_head_and_branch/__driver__.lua	11d555c9da804144b970ddd92332b350b8ee5611
+++ tests/cvs_import,_file_dead_on_head_and_branch/__driver__.lua	0a173ba2bee1798360a7bf0bcc67c0d0fca10435
@@ -10,6 +10,6 @@ tsha = sha1("cvsfile")
 
 -- import into monotone and check presence of files
 
-check(mtn("--branch=testbranch", "cvs_import", "cvs-repository/test"), 0, false, false)
+check(mtn("--branch=testbranch", "cvs-import", "cvs-repository/test"), 0, false, false)
 
 check(mtn("automate", "get_file", tsha), 0, false)
============================================================
--- tests/cvs_import_with_file_added_on_a_branch/__driver__.lua	d0e6597708af820827e6b7337fdfd5f3783f3b8f
+++ tests/cvs_import_with_file_added_on_a_branch/__driver__.lua	d3cb5b63751fae467ebb7f8d462e3770e2766616
@@ -9,4 +9,4 @@ check(get("cvs-repository"))
 -- file on mainline, followed by an add of the file on the branch).
 -- Make sure we handle it correct.
 
+check(mtn("--branch=test", "cvs-import", "cvs-repository"), 0, false, false)
-check(mtn("--branch=test", "cvs_import", "cvs-repository"), 0, false, false)
============================================================
--- tests/db_data_format_checking/__driver__.lua	e3f5be2451252d0c52a609f638c402ac8a9cf302
+++ tests/db_data_format_checking/__driver__.lua	4154cdc004fe386e1b802045a527eaa0c3fb2bda
@@ -23,6 +23,6 @@ check(mtn("-d", "ro-modern.db", "serve",
 check(mtn("-d", "ro-modern.db", "ls", "keys"), 1, false, false)
 check(mtn("-d", "ro-modern.db", "serve", "--bind=127.0.0.1:63219"), 1, false, false)
 
--- arguably "db regenerate_caches" should go here too -- it's treated
+-- arguably "db regenerate-caches" should go here too -- it's treated
 -- similarly.  But the test "schema_migration" tests for its behavior in this
 -- case.
============================================================
--- tests/db_kill_branch_certs_locally_command/__driver__.lua	f7fbe9521eb4e0043364af4c15c44984078d0a9e
+++ tests/db_kill_branch_certs_locally_command/__driver__.lua	af6f94b04b8c03a062bca436bbce1c2ea9a6cf9a
@@ -1,7 +1,7 @@ mtn_setup()
 
 mtn_setup()
 
--- This tests the db kill_branch_certs_locally command
+-- This tests the db kill-branch-certs-locally command
 
 -- Prepare a db with a couple of branches
 addfile("foo", "file named foo")
@@ -13,7 +13,7 @@ check(qgrep("bad", "stdout"))
 check(qgrep("bad", "stdout"))
 
 -- Now we delete the branch, and make sure it's gone
-check(mtn("db", "kill_branch_certs_locally", "bad"), 0, false, false)
+check(mtn("db", "kill-branch-certs-locally", "bad"), 0, false, false)
 check(mtn("ls", "branches"), 0, true, false)
 check(qgrep("good", "stdout"))
 check(not qgrep("bad", "stdout"))
============================================================
--- tests/db_kill_rev_and_recommit/__driver__.lua	dd0ee3ba4f8f41948b81a2beeb1ce51020feb03f
+++ tests/db_kill_rev_and_recommit/__driver__.lua	47639901ec4b07d973e980fefd3677f690762a20
@@ -19,8 +19,8 @@ chdir("..")
 
 chdir("..")
 
--- kill_rev_locally the new child
-check(mtn("db", "kill_rev_locally", new_rev1))
+-- kill-rev-locally the new child
+check(mtn("db", "kill-rev-locally", new_rev1))
 
 -- recreate and attempt to commit the same child again from base
 mkdir("test2")
============================================================
--- tests/db_kill_rev_locally_command/__driver__.lua	7e7b3aa9e42792245a60745ca257ac29f4d57b0c
+++ tests/db_kill_rev_locally_command/__driver__.lua	c68c10b29c3bf9924719a1ebd32f60ecf9792ce1
@@ -1,7 +1,7 @@ mtn_setup()
 
 mtn_setup()
 
--- This tests the db kill_rev_locally command
+-- This tests the db kill-rev-locally command
 
 -- Prepare a db with two revisions
 addfile("testfile", "blah blah")
@@ -13,12 +13,12 @@ child = base_revision()
 child = base_revision()
 
 -- trying to kill the ancestor. This *is supposed to fail*
-check(mtn("db", "kill_rev_locally", ancestor), 1, false, false)
-check(mtn("automate", "get_revision", ancestor), 0, false, false)
+check(mtn("db", "kill-rev-locally", ancestor), 1, false, false)
+check(mtn("automate", "get-revision", ancestor), 0, false, false)
 check(mtn("db", "check"), 0, false, false)
 
 -- killing children is ok, though :)
 check(mtn("automate", "get_revision", child), 0, false, false)
-check(mtn("db", "kill_rev_locally", child), 0, false, false)
-check(mtn("automate", "get_revision", child), 1, false, false)
+check(mtn("db", "kill-rev-locally", child), 0, false, false)
+check(mtn("automate", "get-revision", child), 1, false, false)
 check(mtn("db", "check"), 0, false, false)
============================================================
--- tests/db_kill_rev_locally_command_2/__driver__.lua	328a569a373fa17abb515aad284828a541f0273a
+++ tests/db_kill_rev_locally_command_2/__driver__.lua	62422371bf94080ba4340271029712bdca7cb74d
@@ -16,12 +16,12 @@ check(mtn("automate", "get_revision", ch
 
 -- kill head revision
 check(mtn("automate", "get_revision", child2), 0, false, false)
-check(mtn("db", "kill_rev_locally", child2), 0, false, false)
-check(mtn("automate", "get_revision", child2), 1, false, false)
+check(mtn("db", "kill-rev-locally", child2), 0, false, false)
+check(mtn("automate", "get-revision", child2), 1, false, false)
 check(mtn("db", "check"), 0, false, false)
 
 -- head is an older revision now, let's kill that too
 check(mtn("automate", "get_revision", child1), 0, false, false)
-check(mtn("db", "kill_rev_locally", child1), 0, false, false)
-check(mtn("automate", "get_revision", child1), 1, false, false)
+check(mtn("db", "kill-rev-locally", child1), 0, false, false)
+check(mtn("automate", "get-revision", child1), 1, false, false)
 check(mtn("db", "check"), 0, false, false)
============================================================
--- tests/db_kill_tag_locally/__driver__.lua	eb96c1472d7ef266ce84d3fcfb4beb75b3c57661
+++ tests/db_kill_tag_locally/__driver__.lua	3f57dec2d2885af6f1a774dacb8d2f3099d9f76e
@@ -32,7 +32,7 @@ check(qgrep("other_tag", "stdout"))
 check(qgrep(R4, "stdout"))
 check(qgrep("other_tag", "stdout"))
 
-check(mtn("db", "kill_tag_locally", "test_tag"), 0, false, false)
+check(mtn("db", "kill-tag-locally", "test_tag"), 0, false, false)
 
 check(mtn("ls", "tags"), 0, true, false)
 check(qgrep(R1, "stdout"))
@@ -44,7 +44,7 @@ check(qgrep("other_tag", "stdout"))
 check(qgrep(R4, "stdout"))
 check(qgrep("other_tag", "stdout"))
 
-check(mtn("db", "kill_tag_locally", "ambig_tag"), 0, false, false)
+check(mtn("db", "kill-tag-locally", "ambig_tag"), 0, false, false)
 
 check(mtn("ls", "tags"), 0, true, false)
 check(not qgrep(R1, "stdout"))
============================================================
--- tests/explicit_merge/__driver__.lua	f75cba25216866f6e93ff681879c98835ff20a40
+++ tests/explicit_merge/__driver__.lua	4fbde2c892fdc280c14ab5f4765b3b0e4adcdc58
@@ -24,7 +24,7 @@ right = base_revision()
 commit()
 right = base_revision()
 
-check(mtn("explicit_merge", left, right, "otherbranch"), 0, false, false)
+check(mtn("explicit-merge", left, right, "otherbranch"), 0, false, false)
 
 -- Check that it didn't end up on our current branch, i.e. update doesn't do anything
 check(mtn("update"), 0, false, false)
============================================================
--- tests/explicit_merge_LEFT_RIGHT_ANC_BRANCH/__driver__.lua	01d988717d007d6dbe2fd3d06a973237dc252f46
+++ tests/explicit_merge_LEFT_RIGHT_ANC_BRANCH/__driver__.lua	03e6a505ee5ccf83988a7bc7032b7d36403a3b1d
@@ -23,9 +23,9 @@ right = base_revision()
 right = base_revision()
 
 -- This should fail:
-xfail_if(true, mtn("explicit_merge", left, right, bad_anc, "testbranch"), 1, false, false)
+xfail_if(true, mtn("explicit-merge", left, right, bad_anc, "testbranch"), 1, false, false)
 -- But this should work:
-xfail_if(true, mtn("explicit_merge", left, right, good_anc, "testbranch"), 0, false, false)
+xfail_if(true, mtn("explicit-merge", left, right, good_anc, "testbranch"), 0, false, false)
 -- And produce the logical result:
 check(mtn("update"), 0, false, false)
 writefile("expected", "a\nNEW\nc\nNEW\ne\n")
============================================================
--- tests/importing_a_cvs_file_with_one_version/__driver__.lua	0de6fa65f177b1e770e82c70a42e5d9ddf844a20
+++ tests/importing_a_cvs_file_with_one_version/__driver__.lua	dc137506ce4033c0f267f0d60e54abbaf5c32e81
@@ -8,5 +8,5 @@ tsha = sha1("foo")
 writefile("foo", "version 0 of test file foo\n")
 tsha = sha1("foo")
 
-check(mtn("--branch=testbranch", "cvs_import", "cvs-repository"), 0, false, false)
+check(mtn("--branch=testbranch", "cvs-import", "cvs-repository"), 0, false, false)
 check(mtn("automate", "get_file", tsha), 0, false)
============================================================
--- tests/importing_a_small,_real_cvs_repository/__driver__.lua	4e160d1e01a68084cd29f0603443046e32867bef
+++ tests/importing_a_small,_real_cvs_repository/__driver__.lua	b366ee3903f5da652ebbdcc9687e716a14faf963
@@ -5,7 +5,7 @@ check(get("cvs-repository"))
 
 check(get("cvs-repository"))
 
-check(mtn("--branch=foo.bar", "cvs_import", "cvs-repository"), 0, false, false)
+check(mtn("--branch=foo.bar", "cvs-import", "cvs-repository"), 0, false, false)
 check(mtn("--branch=foo.bar.disasm-branch", "checkout"), 0, true, true)
 check(indir("foo.bar.disasm-branch", mtn("automate", "get_manifest_of")), 0, true)
 canonicalize("stdout")
============================================================
--- tests/importing_cvs_branches_with_correct_ancestory/__driver__.lua	d631fce5fc35c3cbc4f0fcd8fa2967f1747063fe
+++ tests/importing_cvs_branches_with_correct_ancestory/__driver__.lua	ad9d246eccd7e3212d160efa258543379ae43255
@@ -28,7 +28,7 @@ CSHA3=sha1("changelog.3")
 
 
 -- import into monotone and check presence of files
-check(mtn("--branch=test", "cvs_import", "cvs-repository/test"), 0, false, false)
+check(mtn("--branch=test", "cvs-import", "cvs-repository/test"), 0, false, false)
 
 -- check if all branches were imported
 check(mtn("list", "branches"), 0, true, false)
============================================================
--- tests/importing_cvs_files/__driver__.lua	0312cfcedd5ac67a6eba6580b93f4526eb955efd
+++ tests/importing_cvs_files/__driver__.lua	4e4b274ff401d24e0ed1038e44d2f383977ad7d8
@@ -14,13 +14,13 @@ tsha3 = sha1("foo.3")
 tsha3 = sha1("foo.3")
 
 -- safety check -- we stop people from accidentally feeding their whole
--- repo to cvs_import instead of just a module. For that, we re-add the
+-- repo to cvs-import instead of just a module. For that, we re-add the
 -- CVSROOT bookkeeping directory
 mkdir("cvs-repository/CVSROOT")
-check(mtn("--branch=testbranch", "cvs_import", "cvs-repository"), 1, false, false)
+check(mtn("--branch=testbranch", "cvs-import", "cvs-repository"), 1, false, false)
 
 -- import into monotone and check presence of files
-check(mtn("--branch=testbranch", "cvs_import", "cvs-repository/test"), 0, false, false)
+check(mtn("--branch=testbranch", "cvs-import", "cvs-repository/test"), 0, false, false)
 check(mtn("automate", "get_file", tsha0), 0, false)
 check(mtn("automate", "get_file", tsha1), 0, false)
 check(mtn("automate", "get_file", tsha2), 0, false)
============================================================
--- tests/importing_cvs_files_with_identical_logs/__driver__.lua	c96c35bf4d237bb60787fa0b5ca2bcb32a40fc8e
+++ tests/importing_cvs_files_with_identical_logs/__driver__.lua	9f5cf348cf75c8ef0a32abd22d772e82068afee6
@@ -14,7 +14,7 @@ tsha3 = sha1("foo.3")
 tsha3 = sha1("foo.3")
 
 -- import into monotone and check presence of files
-check(mtn("--branch=testbranch", "cvs_import", "cvs-repository/test"), 0, false, false)
+check(mtn("--branch=testbranch", "cvs-import", "cvs-repository/test"), 0, false, false)
 check(mtn("automate", "get_file", tsha0), 0, false)
 check(mtn("automate", "get_file", tsha1), 0, false)
 check(mtn("automate", "get_file", tsha2), 0, false)
============================================================
--- tests/importing_cvs_with_vendor_imports_and_branches/__driver__.lua	336b66cb2d6203748dfc1f1acb85346354288d9c
+++ tests/importing_cvs_with_vendor_imports_and_branches/__driver__.lua	0dff86be69b3e4e630548738b3822ee5c92c363c
@@ -17,7 +17,7 @@ writefile("changelog.3", readfile("chang
 
 
 -- import into monotone and check presence of files
-check(mtn("--branch=test", "cvs_import", "cvs-repository/test"), 0, false, false)
+check(mtn("--branch=test", "cvs-import", "cvs-repository/test"), 0, false, false)
 
 check(mtn("checkout", "--branch=test", "maindir"), 0, false, false)
 check(mtn("checkout", "--branch=test.branched", "branchdir"), 0, false, false)
============================================================
--- tests/inodeprints/__driver__.lua	1fa3521e195de0dbfd8af44f6c0fe5925ee10242
+++ tests/inodeprints/__driver__.lua	6e4e49b4da9b78e7bb130a135da9a057e3b12b58
@@ -35,7 +35,7 @@ check(qgrep("stuff stuff", "stdout"))
 check(mtn("diff"), 0, true, false)
 check(qgrep("stuff stuff", "stdout"))
 -- Should have changed the inodeprints file
-check(mtn("refresh_inodeprints"), 0, false, false)
+check(mtn("refresh-inodeprints"), 0, false, false)
 check(not samefile("_MTN/inodeprints", "ip1"))
 
 -- Make sure partial commit doesn't screw things up
============================================================
--- tests/ls_epochs/__driver__.lua	44903563c5c09b46495d1913003634b558dd7e2b
+++ tests/ls_epochs/__driver__.lua	40174897c1c97b073a84088bbd5bd6a95245af7f
@@ -7,9 +7,9 @@ commit("otherbranch")
 addfile("testfile2", "other data")
 commit("otherbranch")
 
-check(mtn("db", "set_epoch", "testbranch", "12345"), 1, false, false)
-check(mtn("db", "set_epoch", "testbranch", string.rep("a", 40)), 0, false, false)
-check(mtn("db", "set_epoch", "otherbranch", string.rep("b", 40)), 0, false, false)
+check(mtn("db", "set-epoch", "testbranch", "12345"), 1, false, false)
+check(mtn("db", "set-epoch", "testbranch", string.rep("a", 40)), 0, false, false)
+check(mtn("db", "set-epoch", "otherbranch", string.rep("b", 40)), 0, false, false)
 
 check(mtn("list", "epochs"), 0, true)
 check(qgrep("testbranch", "stdout"))
============================================================
--- tests/merge_a_project_into_a_subdirectory_of_an_unrelated_project/__driver__.lua	b40636cde4c94c2ce63862e36f398a7bf6a6b644
+++ tests/merge_a_project_into_a_subdirectory_of_an_unrelated_project/__driver__.lua	cf3c4cf5e2a062351262f44aa95a912936837916
@@ -13,7 +13,7 @@ commit("b2")
 addfile("dir/quux", "baz")
 commit("b2")
 
-check(mtn("merge_into_dir", "b1", "b2", "dir/zuul"), 0, false, false)
+check(mtn("merge-into-dir", "b1", "b2", "dir/zuul"), 0, false, false)
 
 check(mtn("checkout", "-b", "b2", "checkout"), 0, false, true)
 check(exists("checkout/file2"))
============================================================
--- tests/merge_conflict_with_no_lca/__driver__.lua	024b58c36ab28c05edd9e308451863c3ae3852be
+++ tests/merge_conflict_with_no_lca/__driver__.lua	00ae76ae73416d02a6f4cb0b2ba32eda7852c846
@@ -14,13 +14,13 @@ commit()
 netsync.sync("*branch")
 append("foo", "bar\n")
 commit()
-check(mtn("merge_into_dir", "otherbranch", "testbranch", "test"), 0, false, false)
+check(mtn("merge-into-dir", "otherbranch", "testbranch", "test"), 0, false, false)
 
 check(mtn("update", "-r", base), 0, false, false)
 
 append("foo", "baz\n")
 commit(nil, nil, mtn2)
-check(mtn2("merge_into_dir", "otherbranch", "testbranch", "test"), 0, false, false)
+check(mtn2("merge-into-dir", "otherbranch", "testbranch", "test"), 0, false, false)
 
 check(get("rcfile"))
 check(mtn("merge", "--rcfile", "rcfile"), 0, false, false)
============================================================
--- tests/merge_into_workspace/__driver__.lua	eff4b2a9a9871f5086b302176397d983e6590c54
+++ tests/merge_into_workspace/__driver__.lua	9ddcf96909adfaceec5d57cefe25fafb4d0b7148
@@ -1,4 +1,4 @@
--- this is very similar to the explicit_merge test, except that the
+-- this is very similar to the explicit-merge test, except that the
 -- result of the merge winds up in the current workspace.
 
 function samefile_ignore_dates(a, b)
@@ -49,17 +49,17 @@ rename("stdout", "ancestry")
 check(mtn("automate", "graph"), 0, true, nil)
 rename("stdout", "ancestry")
 
--- we're currently at "right", so a merge_into_workspace of "left"
+-- we're currently at "right", so a merge-into-workspace of "left"
 -- is the merge we want; but first, test the sanity checks
 
 copy("otherfile_mod", "otherfile")
 
 -- this should fail, because the workspace is unclean
-check(mtn("merge_into_workspace", left), 1, false, false)
+check(mtn("merge-into-workspace", left), 1, false, false)
 
 -- after reverting, it should work
 check(mtn("revert", "otherfile"), 0, false, false)
-check(mtn("merge_into_workspace", left), 0, false, false)
+check(mtn("merge-into-workspace", left), 0, false, false)
 
 -- testfile should be the same as merged
 check(samefile("merged", "testfile"))
============================================================
--- tests/merge_into_workspace_attr_corpse/__driver__.lua	7f01da1af5eedec9debf4f2d8f1dd7ec14561dcf
+++ tests/merge_into_workspace_attr_corpse/__driver__.lua	c8a9049598cef180a05effb1e33a02ad3efabbea
@@ -28,7 +28,7 @@ rename("stdout", "ancestry")
 rename("stdout", "ancestry")
 
 -- the merge should succeed
-check(mtn("merge_into_workspace", left), 0, false, false)
+check(mtn("merge-into-workspace", left), 0, false, false)
 
 -- the database should be unaffected, i.e. the operation
 -- should not have created any new revisions
@@ -42,7 +42,7 @@ check(get("expected-roster"))
 -- in-database merge would generate; in particular, both "left-attr"
 -- and "right-attr" should show up as "dormant_attr"s.
 check(get("expected-roster"))
-check(mtn("get_roster"), 0, true, nil)
+check(mtn("get-roster"), 0, true, nil)
 canonicalize("stdout")
 check(samefile("expected-roster", "stdout"))
 
============================================================
--- tests/merge_into_workspace_files_added/__driver__.lua	e09ec5adbbdd7e60dc85d72fbbb8029152a9cce3
+++ tests/merge_into_workspace_files_added/__driver__.lua	915e06047deb09fabf1b156352c2ceb12837ea51
@@ -28,7 +28,7 @@ rename("stdout", "ancestry")
 rename("stdout", "ancestry")
 
 -- the merge should succeed
-check(mtn("merge_into_workspace", left), 0, false, false)
+check(mtn("merge-into-workspace", left), 0, false, false)
 
 -- testfile, left, right should all exist and equal their originals
 
============================================================
--- tests/merge_into_workspace_no_changes/__driver__.lua	26e56364aa09b4406a2b0c33a519649b61423f74
+++ tests/merge_into_workspace_no_changes/__driver__.lua	b26e7d70671079636d4ee7082655f60bd210df13
@@ -34,7 +34,7 @@ rename("stdout", "ancestry")
 rename("stdout", "ancestry")
 
 -- the merge should succeed
-check(mtn("merge_into_workspace", left), 0, false, false)
+check(mtn("merge-into-workspace", left), 0, false, false)
 
 -- testfile should be the same as left
 check(samefile("left", "testfile"))
@@ -49,7 +49,7 @@ check(qgrep("no changes", "stdout"))
 
 -- we should not be able to merge anything on top of this, despite
 -- there being no changes in the workspace
-check(mtn("merge_into_workspace", unrelated), 1, false, false)
+check(mtn("merge-into-workspace", unrelated), 1, false, false)
 
 -- a commit at this point should succeed, again despite having no changes
 commit()
============================================================
--- tests/merge_into_workspace_same_rev/__driver__.lua	990798ba737451deac9b7414bd742bfea3f4ecf1
+++ tests/merge_into_workspace_same_rev/__driver__.lua	90facc7ea8ba0208eff721ad1797275a1cb5ccd9
@@ -9,4 +9,4 @@ other = base_revision()
 other = base_revision()
 
 -- try merging the current workspace head into the workspace
+check(mtn("merge-into-workspace", other), 1, nil, false)
-check(mtn("merge_into_workspace", other), 1, nil, false)
============================================================
--- tests/merge_rev_with_ancestor/__driver__.lua	7a11b3b2570698ef3120a296899ed9876d0b7720
+++ tests/merge_rev_with_ancestor/__driver__.lua	0627a6ccf4f523cd47d42410c623d4b49aa55c6d
@@ -17,5 +17,5 @@ r2 = base_revision()
 commit()
 r2 = base_revision()
 
+check(mtn("explicit-merge", r0, r1, "testbranch"), 1, false, false)
+check(mtn("explicit-merge", r1, r0, "testbranch"), 1, false, false)
-check(mtn("explicit_merge", r0, r1, "testbranch"), 1, false, false)
-check(mtn("explicit_merge", r1, r0, "testbranch"), 1, false, false)
============================================================
--- tests/migrate_workspace/__driver__.lua	276c6f7ad3766a9ca513b1b5074120d9de987b2c
+++ tests/migrate_workspace/__driver__.lua	bb1a48fdf18e85e139a1f39aed183c6ad0a46a80
@@ -1,28 +1,28 @@
--- General checks of the migrate_workspace command; see workspace_migration
+-- General checks of the migrate-workspace command; see workspace_migration
 -- for exhaustive checks of migration from each possible format version.
 
 mtn_setup()
 
--- mtn migrate_workspace requires a workspace.
+-- mtn migrate-workspace requires a workspace.
 rename("_MTN","_MTN.not")
-check(mtn("migrate_workspace"), 1, nil, true)
+check(mtn("migrate-workspace"), 1, nil, true)
 check(qgrep("workspace required but not found", "stderr"))
 rename("_MTN.not","_MTN")
 
--- Given a workspace in the current format, migrate_workspace should
+-- Given a workspace in the current format, migrate-workspace should
 -- just print a message and exit successfully.
 addfile("foo", "foo")
 commit()
-check(mtn("migrate_workspace"), 0, nil, true)
+check(mtn("migrate-workspace"), 0, nil, true)
 check(qgrep("workspace is in the current format", "stderr"))
 
--- Given a workspace in an absurdly high format, migrate_workspace
+-- Given a workspace in an absurdly high format, migrate-workspace
 -- should fail, and so should ordinary operations on the workspace.
 writefile("_MTN/format", "999999999\n")
 check(mtn("status"), 1, nil, true)
 check(qgrep("need a newer version", "stderr"))
 check(qgrep("^999999999$", "_MTN/format"))
-check(mtn("migrate_workspace"), 1, nil, true)
+check(mtn("migrate-workspace"), 1, nil, true)
 check(qgrep("need a newer version", "stderr"))
 check(qgrep("^999999999$", "_MTN/format"))
 
@@ -36,6 +36,6 @@ check(exists("MT"))
 check(mtn("status"), 1, nil, true)
 check(qgrep("metadata is in format 0", "stderr"))
 check(exists("MT"))
-check(mtn("migrate_workspace"), 1, nil, true)
+check(mtn("migrate-workspace"), 1, nil, true)
 check(qgrep("not possible to migrate from workspace format 0", "stderr"))
 check(exists("MT"))
============================================================
--- tests/netsync_client_absorbs_and_checks_epochs/__driver__.lua	c9ca91058a28985d1e07fba47cc85181580f2a41
+++ tests/netsync_client_absorbs_and_checks_epochs/__driver__.lua	b71b98c81d97d8a54a240ab0bf3ffa5457ba8137
@@ -34,9 +34,9 @@ revs[1] = base_revision()
 revs[1] = base_revision()
 
 -- change the epochs in the first db
-check(mtn("db", "set_epoch", "testbranch", "12345"), 1, false, false)
-check(mtn("db", "set_epoch", "testbranch", string.rep("a", 40)), 0, false, false)
-check(mtn("db", "set_epoch", "otherbranch", string.rep("a", 40)), 0, false, false)
+check(mtn("db", "set-epoch", "testbranch", "12345"), 1, false, false)
+check(mtn("db", "set-epoch", "testbranch", string.rep("a", 40)), 0, false, false)
+check(mtn("db", "set-epoch", "otherbranch", string.rep("a", 40)), 0, false, false)
 
 -- this should *fail* to sync 
 srv = netsync.start()
============================================================
--- tests/netsync_epoch_refinement/__driver__.lua	4ed9c46f6864a2c19cb69af2e4126bfe787d1c2c
+++ tests/netsync_epoch_refinement/__driver__.lua	223a9a8854c1a4f24272fc492b1559e6a8978165
@@ -8,8 +8,8 @@ commit()
 
 addfile("foo", "foo")
 commit()
-check(mtn("db", "set_epoch", "testbranch", string.rep("1234567890", 4)))
-check(mtn2("db", "set_epoch", "testbranch", string.rep("1234567890", 4)))
+check(mtn("db", "set-epoch", "testbranch", string.rep("1234567890", 4)))
+check(mtn2("db", "set-epoch", "testbranch", string.rep("1234567890", 4)))
 
 -- If we completely ignore the epoch (because we already have it), we'll
 -- never notice that refinement is done.
============================================================
--- tests/netsync_hook_errcodes/__driver__.lua	1e4504885124bfa64eeb91ce357c3a8f4820a94b
+++ tests/netsync_hook_errcodes/__driver__.lua	752483f66dd0b8df4eed6367c16b9d15a3fa1060
@@ -61,8 +61,8 @@ clearnotes()
 chk_errcode_is(422)
 clearnotes()
 
-check(mtn("db", "set_epoch", "testbranch", string.rep("0", 40)))
-check(mtn2("db", "set_epoch", "testbranch", string.rep("1", 40)))
+check(mtn("db", "set-epoch", "testbranch", string.rep("0", 40)))
+check(mtn2("db", "set-epoch", "testbranch", string.rep("1", 40)))
 srv = netsync.start()
 srv:push({"testbranch"}, 2, 1)
 srv:stop()
============================================================
--- tests/netsync_server_absorbs_and_checks_epochs/__driver__.lua	cc83b2b114c4065c65f166c731e7b9090892bf83
+++ tests/netsync_server_absorbs_and_checks_epochs/__driver__.lua	84376958352a4c5ab71ececd3e5e7d8434e9da87
@@ -36,8 +36,8 @@ revs[1] = base_revision()
 revs[1] = base_revision()
 
 -- change the epochs in the second db
-check(mtn("db", "set_epoch", "testbranch", string.rep("a", 40)), 0, false, false)
-check(mtn("db", "set_epoch", "otherbranch", string.rep("a", 40)), 0, false, false)
+check(mtn("db", "set-epoch", "testbranch", string.rep("a", 40)), 0, false, false)
+check(mtn("db", "set-epoch", "otherbranch", string.rep("a", 40)), 0, false, false)
 
 -- this should *fail* to sync 
 srv = netsync.start()
============================================================
--- tests/one-way_netsync_where_the_sink_has_more_epochs/__driver__.lua	bb8e382b933199a1949323f0d4005db68b6d17bf
+++ tests/one-way_netsync_where_the_sink_has_more_epochs/__driver__.lua	581d113937bf0b9bfbd859cb99fe69e8449fe940
@@ -12,7 +12,7 @@ commit()
 
 addfile("foo", "foo")
 commit()
-check(mtn("db", "set_epoch", "testbranch", string.rep("1234567890", 4)))
+check(mtn("db", "set-epoch", "testbranch", string.rep("1234567890", 4)))
 remove("_MTN")
 check(mtn2("setup", "-b", "otherbranch", "."), 0, false, false)
 writefile("bar", "bar")
============================================================
--- tests/pivot_root/__driver__.lua	74d3f9a78052165a356b5958f1119f2309038a4c
+++ tests/pivot_root/__driver__.lua	4fe26f9776c449f851e031a84ac32b97b9dff813
@@ -23,18 +23,18 @@ check(indir("workspace", mtn("commit", "
 
 check(indir("workspace", mtn("commit", "-m", "foo")), 0, false, false)
 
-check(indir("workspace", mtn("pivot_root", "--bookkeep-only", "nosuchdir", "foo")), 1, false, false)
-check(indir("workspace", mtn("pivot_root", "--bookkeep-only", "dir1/file1", "foo")), 1, false, false)
-check(indir("workspace", mtn("pivot_root", "--bookkeep-only", "dir3", "old_root")), 1, false, false)
-check(indir("workspace", mtn("pivot_root", "--bookkeep-only", "dir1", "nosuchdir/old_root")), 1, false, false)
-check(indir("workspace", mtn("pivot_root", "--bookkeep-only", "dir1", "file1/old_root")), 1, false, false)
-check(indir("workspace", mtn("pivot_root", "--bookkeep-only", "dir1", "dir2")), 1, false, false)
+check(indir("workspace", mtn("pivot-root", "--bookkeep-only", "nosuchdir", "foo")), 1, false, false)
+check(indir("workspace", mtn("pivot-root", "--bookkeep-only", "dir1/file1", "foo")), 1, false, false)
+check(indir("workspace", mtn("pivot-root", "--bookkeep-only", "dir3", "old_root")), 1, false, false)
+check(indir("workspace", mtn("pivot-root", "--bookkeep-only", "dir1", "nosuchdir/old_root")), 1, false, false)
+check(indir("workspace", mtn("pivot-root", "--bookkeep-only", "dir1", "file1/old_root")), 1, false, false)
+check(indir("workspace", mtn("pivot-root", "--bookkeep-only", "dir1", "dir2")), 1, false, false)
 
 check(indir("workspace", mtn("ls", "changed")), 0)
 check(indir("workspace", mtn("ls", "missing")), 0)
 check(indir("workspace", mtn("ls", "unknown")), 0)
 
-check(indir("workspace", mtn("pivot_root", "dir1", "old_root")), 0, false, false)
+check(indir("workspace", mtn("pivot-root", "dir1", "old_root")), 0, false, false)
 
 check(isdir("workspace/_MTN"))
 check(isdir("workspace/dir2"))
============================================================
--- tests/pivot_root_to_new_dir/__driver__.lua	1aced95b97d46debcd4087b1624980c159de369f
+++ tests/pivot_root_to_new_dir/__driver__.lua	5567deac032449f1b5d454228f21e1fe6c86429c
@@ -1,6 +1,6 @@ mtn_setup()
 mtn_setup()
 
--- pivot_root to a directory that hasn't been commited yet should work
+-- pivot-root to a directory that hasn't been commited yet should work
 
 mkdir("workspace")
 check(indir("workspace", mtn("setup", ".", "-b", "testbranch")),
@@ -14,7 +14,7 @@ check(indir("workspace", mtn("add", "new
 mkdir("workspace/new_root")
 check(indir("workspace", mtn("add", "new_root")), 0, false, false)
 
-check(indir("workspace", mtn("pivot_root", "new_root", "Attic")),
+check(indir("workspace", mtn("pivot-root", "new_root", "Attic")),
       0, false, false)
 
 check(isdir("workspace/_MTN"))
============================================================
--- tests/pluck_lifecycle/__driver__.lua	9108772eb30390339e6e827295af01751a471562
+++ tests/pluck_lifecycle/__driver__.lua	1f4175dd825bd3fa30d7230cf550abf4dfe34936
@@ -40,7 +40,7 @@ two_rev = base_revision()
 two_rev = base_revision()
 
 -- and merge 1
-check(mtn("explicit_merge", one_rev, two_rev, "testbranch"), 0, false, false)
+check(mtn("explicit-merge", one_rev, two_rev, "testbranch"), 0, false, false)
 check(mtn("update"), 0, false, false)
 
 -- check that we need the edit for b
============================================================
--- tests/refresh_inodeprints/__driver__.lua	c258a2f89893ea52c5f2ca862afbeb73991d76d3
+++ tests/refresh_inodeprints/__driver__.lua	37f95d9e0e8080f687da73f8653d0556b10eac40
@@ -6,6 +6,6 @@ check(not exists("_MTN/inodeprints"))
 
 check(not exists("_MTN/inodeprints"))
 
-check(mtn("refresh_inodeprints"))
+check(mtn("refresh-inodeprints"))
 check(exists("_MTN/inodeprints"))
 check(fsize("_MTN/inodeprints") ~= 0)
============================================================
--- tests/restricted_commit_with_inodeprints/__driver__.lua	b11b4fbd4ed1b88ccb61d2b9ea5347c61a360c47
+++ tests/restricted_commit_with_inodeprints/__driver__.lua	2939405aa7347949a7a08a230e7ee179237e3181
@@ -14,7 +14,7 @@ mtn_setup()
 -- would not be updated but the old cached value can't possibly equal the current
 -- value since the file does not exist and cannot have an inodeprint.
 
--- also, it may be a useful feature (?) to allow refresh_inodeprints to update
+-- also, it may be a useful feature (?) to allow refresh-inodeprints to update
 -- its cache for a restricted set of files by allowing paths on the command line
 -- to establish a restriction.
 
@@ -23,7 +23,7 @@ commit()
 commit()
 
 -- enable inodeprints mode
-check(mtn("refresh_inodeprints"), 0, false, false)
+check(mtn("refresh-inodeprints"), 0, false, false)
 
 addfile("file2", "file2")
 
============================================================
--- tests/reverting_a_pivot_root/__driver__.lua	36d99a86c367367863e36a2af9d0911543d074f6
+++ tests/reverting_a_pivot_root/__driver__.lua	759d883af4cf540de59766267510b68a7f8e0278
@@ -17,7 +17,7 @@ check(indir("workspace", mtn("commit", "
 
 check(indir("workspace", mtn("commit", "-m", "foo")), 0, false, false)
 
-check(indir("workspace", mtn("pivot_root", "dir1", "old_root")), 0, false, false)
+check(indir("workspace", mtn("pivot-root", "dir1", "old_root")), 0, false, false)
 
 check(isdir("workspace/_MTN"))
 check(isdir("workspace/dir2"))
============================================================
--- tests/schema_migration/__driver__.lua	d708709c691b1536d54702969a8ffbffd5fa3c5f
+++ tests/schema_migration/__driver__.lua	faf35d059cd73f5fdf1f842a3a784866c5a725d1
@@ -90,24 +90,24 @@ function check_migrate_from(id, need_reg
   check(qgrep(id, "stdout"))
   -- migrate it
   check(mtn("--db="..id..".mtn", "db", "migrate"), 0, false, true)
-  -- check to see if it told us to regenerate_caches
+  -- check to see if it told us to regenerate-caches
   if (need_regen_rosters) then
      -- then the migrate should have warned us
-     check(string.find(readfile("stderr"), "regenerate_caches") ~= nil)
+     check(qgrep("regenerate-caches", "stderr"))
      -- and normal commands on the db should notice the problem and error out
      check(mtn("--db="..id..".mtn", "ls", "keys"), 1, false, true)
-     check(qgrep("regenerate_caches", "stderr"))
+     check(qgrep("regenerate-caches", "stderr"))
      -- and we should do the regeneration
-     check(mtn("--db="..id..".mtn", "db", "regenerate_caches"), 0, false, false)
+     check(mtn("--db="..id..".mtn", "db", "regenerate-caches"), 0, false, false)
      -- after which, normal commands should work again
      check(mtn("--db="..id..".mtn", "ls", "keys"), 0, false, true)
-     check(not qgrep("regenerate_caches", "stderr"))
+     check(not qgrep("regenerate-caches", "stderr"))
   else
      -- then the migrate should not have warned us
-     check(string.find(readfile("stderr"), "regenerate_caches") == nil)
+     check(string.find(readfile("stderr"), "regenerate-caches") == nil)
      -- and normal commands on the db should work fine
      check(mtn("--db="..id..".mtn", "ls", "keys"), 0, false, true)
-     check(not qgrep("regenerate_caches", "stderr"))
+     check(not qgrep("regenerate-caches", "stderr"))
   end
   check_same_db_contents(id..".mtn", "latest.mtn")
 end
============================================================
--- tests/schema_migration_error_recovery/__driver__.lua	a4b51f336dff083ec53c2199d398f8edb90da941
+++ tests/schema_migration_error_recovery/__driver__.lua	ddc8fcc8f7cc594e6237af9f36c4c3d70090b98a
@@ -8,7 +8,7 @@ function test_one(tag, target, diagnosti
    db = tag .. ".mtn"
    check(get(dump))
    check(raw_mtn("db", "load", "-d", db), 0, nil, nil, {dump})
-   check(raw_mtn("test_migration_step", target, "-d", db), 1, nil, true)
+   check(raw_mtn("test-migration-step", target, "-d", db), 1, nil, true)
    check(qgrep(diagnostic, "stderr"))
 end
 
============================================================
--- tests/show_conflicts/__driver__.lua	4cc6d804eb657c20e67c5bf3ebf6bfd2a0f9b20d
+++ tests/show_conflicts/__driver__.lua	a65e584428d5e3ee071a0639c9d669167a5837c2
@@ -17,7 +17,7 @@ right = base_revision()
 commit("branch")
 right = base_revision()
 
-check(mtn("show_conflicts", left, right), 0, false, true)
+check(mtn("show-conflicts", left, right), 0, false, true)
 rename("stderr", "conflicts")
 
 check(qgrep("There are 1 node_name_conflicts", "conflicts"))
============================================================
--- tests/ssh_agent/__driver__.lua	30ecccfbc733d168397e221984aaa41a114b7b17
+++ tests/ssh_agent/__driver__.lua	663042633f5dab8065d49cc28c57d33906611c47
@@ -1,6 +1,6 @@
 -- with no monotone keys:
 -- * (E) export monotone key
-check(mtn("ssh_agent_export"), 1, false, false)
+check(mtn("ssh-agent-export"), 1, false, false)
 
 mtn_setup()
 
@@ -12,22 +12,22 @@ check(mtn("ci", "--message", "commit msg
 check(mtn("ci", "--message", "commit msg"), 0, false, false)
 
 -- * (E) export key with -k that does not exist
-check(mtn("--key", "address@hidden", "ssh_agent_export"), 1, false, false)
+check(mtn("--key", "address@hidden", "ssh-agent-export"), 1, false, false)
 
 -- * (ok) export key without -k
 check(raw_mtn("--rcfile", test.root .. "/test_hooks.lua", -- "--nostd",
               "--db=" .. test.root .. "/test.db",
               "--keydir", test.root .. "/keys",
-              "ssh_agent_export"), 0, false, false)
+              "ssh-agent-export"), 0, false, false)
 
 -- * (ok) export key with -k that does exist
-check(mtn("--key", "address@hidden", "ssh_agent_export"), 0, false, false)
+check(mtn("--key", "address@hidden", "ssh-agent-export"), 0, false, false)
 
 -- * (ok) export monotone key with passphrase
-check(mtn("ssh_agent_export"), 0, false, false, tkey .. "\n" .. tkey .. "\n")
+check(mtn("ssh-agent-export"), 0, false, false, tkey .. "\n" .. tkey .. "\n")
 
 -- * (ok) export monotone key without passphrase
-check(mtn("ssh_agent_export", "id_monotone"), 0, false, false)
+check(mtn("ssh-agent-export", "id_monotone"), 0, false, false)
 skip_if(not existsonpath("chmod"))
 check({"chmod", "600", "id_monotone"}, 0, false, false)
 
@@ -45,8 +45,8 @@ end
    end
 end
 
--- * (ok) mtn ssh_agent_add adds key to agent
-check(mtn("ssh_agent_add"), 0, false, false)
+-- * (ok) mtn ssh-agent-add adds key to agent
+check(mtn("ssh-agent-add"), 0, false, false)
 check({"ssh-add", "-l"}, 0, true, false)
 ok = false
 for line in io.lines("stdout") do
@@ -154,7 +154,7 @@ check(mtn("ci", "--message", "commit msg
 check(mtn("ci", "--message", "commit msg"), 0, false, false)
 
 -- * (ok) export key with password
-check(mtn("ssh_agent_export", "id_monotone_pass"), 0, false, false, "\npass\npass\n")
+check(mtn("ssh-agent-export", "id_monotone_pass"), 0, false, false, "\npass\npass\n")
 skip_if(not existsonpath("chmod"))
 check({"chmod", "600", "id_monotone_pass"}, 0, false, false)
 
@@ -191,23 +191,23 @@ check(raw_mtn("--rcfile", test.root .. "
 check(raw_mtn("--rcfile", test.root .. "/test_hooks.lua", -- "--nostd",
               "--db=" .. test.root .. "/test.db",
               "--keydir", test.root .. "/keys",
-              "ssh_agent_export"), 1, false, false)
+              "ssh-agent-export"), 1, false, false)
 
 -- * (N)  try to add monotone key without -k
 remove("_MTN/options")
 check(raw_mtn("--rcfile", test.root .. "/test_hooks.lua", -- "--nostd",
               "--db=" .. test.root .. "/test.db",
               "--keydir", test.root .. "/keys",
-              "ssh_agent_add"), 1, false, false)
+              "ssh-agent-add"), 1, false, false)
 
 -- * (ok) export monotone key with -k
-check(mtn("ssh_agent_export", "--key", "address@hidden", "id_monotone2"), 0, false, false)
+check(mtn("ssh-agent-export", "--key", "address@hidden", "id_monotone2"), 0, false, false)
 skip_if(not existsonpath("chmod"))
 check({"chmod", "600", "id_monotone2"}, 0, false, false)
 
--- * (ok) mtn ssh_agent_add with -k adds key to agent
+-- * (ok) mtn ssh-agent-add with -k adds key to agent
 check({"ssh-add", "-D"}, 0, false, false)
-check(mtn("ssh_agent_add", "--key", "address@hidden"), 0, false, false)
+check(mtn("ssh-agent-add", "--key", "address@hidden"), 0, false, false)
 check({"ssh-add", "-l"}, 0, true, false)
 ok = false
 for line in io.lines("stdout") do
@@ -253,11 +253,11 @@ check(mtn("genkey", "address@hidden
 -- * (ok) create passworded key and export it
 check({"ssh-add", "-D"}, 0, false, false)
 check(mtn("genkey", "address@hidden"), 0, false, false, "pass\npass\n")
-check(mtn("ssh_agent_export", "--key", "address@hidden"), 0, false, false, "pass\npass2\npass2\n")
+check(mtn("ssh-agent-export", "--key", "address@hidden"), 0, false, false, "pass\npass2\npass2\n")
 
 -- * (ok) add passworded key
 check({"ssh-add", "-D"}, 0, false, false)
-check(mtn("ssh_agent_add", "--key", "address@hidden"), 0, false, false, "pass\n")
+check(mtn("ssh-agent-add", "--key", "address@hidden"), 0, false, false, "pass\n")
 check({"ssh-add", "-l"}, 0, true, false)
 ok = false
 for line in io.lines("stdout") do
============================================================
--- tests/test_a_merge_7/__driver__.lua	7811dc728183fe9b01fc68dcef994e87865d72ea
+++ tests/test_a_merge_7/__driver__.lua	219767be3bdc7c2b47adec31ef7a0b17573430aa
@@ -43,7 +43,7 @@ revs.d = base_revision()
 commit()
 revs.d = base_revision()
 
-check(mtn("explicit_merge", revs.d, revs.c, "testbranch"), 0, false, false)
+check(mtn("explicit-merge", revs.d, revs.c, "testbranch"), 0, false, false)
 check(mtn("update"), 0, false, false)
 revs.e = base_revision()
 
============================================================
--- tests/test_problematic_cvs_import/__driver__.lua	6340ee26326384bd4cff3b58bab4330aa4edc777
+++ tests/test_problematic_cvs_import/__driver__.lua	71ef4c4bf99f6d52ec9c4746fc556ea56699c151
@@ -10,4 +10,4 @@ check(get("cvs-repository"))
 -- This rcs file fails to be imported correctly by monotone
 check(get("cvs-repository"))
 
+xfail_if(true, mtn("--branch=test", "cvs-import", "cvs-repository/test"), 0, ignore, ignore)
-xfail_if(true, mtn("--branch=test", "cvs_import", "cvs-repository/test"), 0, ignore, ignore)
============================================================
--- tests/two_parent_workspace_add_drop_rename/__driver__.lua	f2edf6e4783c744259d791f4452fdabd211451e6
+++ tests/two_parent_workspace_add_drop_rename/__driver__.lua	0a140a1c43fd46255dce87e7976c6b16d40e86a1
@@ -12,7 +12,7 @@ commit()
 writefile("foo", "ancestor\nright")
 commit()
 
-check(mtn("merge_into_workspace", other), 0, false, false)
+check(mtn("merge-into-workspace", other), 0, false, false)
 
 writefile("fudgie", "fudgie content")
 
============================================================
--- tests/two_parent_workspace_annotate/__driver__.lua	6cf020efb5377b79641fb655923731702df6c318
+++ tests/two_parent_workspace_annotate/__driver__.lua	e9e6bb4046bcdd5f6b3962f5b54a2a1c65f4f3d7
@@ -23,7 +23,7 @@ right = base_revision()
 commit()
 right = base_revision()
 
-check(mtn("merge_into_workspace", left), 0, false, false)
+check(mtn("merge-into-workspace", left), 0, false, false)
 
 -- testfile should be the same as merged
 check(samefile("merged", "testfile"))
============================================================
--- tests/two_parent_workspace_attrs/__driver__.lua	abe04ad8bfd544146962c1280b976f5a0c5602d9
+++ tests/two_parent_workspace_attrs/__driver__.lua	01b4ec344afdf758eb392379eac42350bf550ab2
@@ -16,7 +16,7 @@ right = base_revision()
 commit()
 right = base_revision()
 
-check(mtn("merge_into_workspace", left), 0, false, false)
+check(mtn("merge-into-workspace", left), 0, false, false)
 check(qgrep("left", "testfile"))
 check(qgrep("right", "testfile"))
 check(not qgrep("ancestor", "testfile"))
============================================================
--- tests/two_parent_workspace_commands_that_fail/__driver__.lua	ddb96c7133077b7166f21a65ad3d7e6bd97da49a
+++ tests/two_parent_workspace_commands_that_fail/__driver__.lua	958107be7f1f4028fe565e95e2a33dcb48183ec3
@@ -20,7 +20,7 @@ right = base_revision()
 commit()
 right = base_revision()
 
-check(mtn("merge_into_workspace", left), 0, false, false)
+check(mtn("merge-into-workspace", left), 0, false, false)
 check(qgrep("left", "testfile"))
 check(qgrep("right", "testfile"))
 check(not qgrep("ancestor", "testfile"))
@@ -29,7 +29,7 @@ diffdiag = ("mtn: misuse: this workspace
 diffdiag = ("mtn: misuse: this workspace has more than one parent\n"..
 	    "mtn: misuse: (specify a revision to diff against with --revision)\n")
 
-check(mtn("merge_into_workspace", anc), 1, nil, diag)
+check(mtn("merge-into-workspace", anc), 1, nil, diag)
 
 -- diff with no arguments: what parent?
 check(mtn("diff"), 1, nil, diffdiag)
============================================================
--- tests/two_parent_workspace_inodeprint_from_birth/__driver__.lua	a9e6bc3f44cd5e115d22ab4c6616a50471bbb230
+++ tests/two_parent_workspace_inodeprint_from_birth/__driver__.lua	dc9c693e6c4111629d2b6c199ff2e75046a9d870
@@ -28,7 +28,7 @@ sleep(5)
 -- create second child from ancestor (right)
 revert_to(anc)
 sleep(5)
-check(mtn("refresh_inodeprints"), 0, false, false)
+check(mtn("refresh-inodeprints"), 0, false, false)
 
 check(qgrep("foo", "_MTN/inodeprints"))
 check(not qgrep("right", "_MTN/inodeprints"))
@@ -43,7 +43,7 @@ check(qgrep("foo", "_MTN/inodeprints"))
 check(qgrep("foo", "_MTN/inodeprints"))
 
 -- now create a two parent workspace
-check(mtn("merge_into_workspace", other), 0, false, false)
+check(mtn("merge-into-workspace", other), 0, false, false)
 
 check(fsize("_MTN/inodeprints") ~= 0)
 
@@ -54,19 +54,19 @@ check(qgrep("bar", "_MTN/inodeprints"))
 check(qgrep("bar", "_MTN/inodeprints"))
 
 -- left and right are unchanged, but added in the other parent, so should be
--- inodeprinted, except that left was added during the merge_into_workspace,
+-- inodeprinted, except that left was added during the merge-into-workspace,
 -- so it might be too new to be inodeprinted (depending on the speed the
 -- test happens to run), so we don't check for it.
 check(qgrep("right", "_MTN/inodeprints"))
 
 -- wait a bit, refresh, and check that left shows up now
 sleep(5)
-check(mtn("refresh_inodeprints"))
+check(mtn("refresh-inodeprints"))
 check(qgrep("left", "_MTN/inodeprints"))
 
--- test explicit refresh_inodeprints
+-- test explicit refresh-inodeprints
 addfile("in-two-parent", "in-two-parent's file content")
 sleep(5)
-check(mtn("refresh_inodeprints"), 0, false, false)
+check(mtn("refresh-inodeprints"), 0, false, false)
 check(fsize("_MTN/inodeprints") ~= 0)
 check(qgrep("in-two-parent", "_MTN/inodeprints"))
============================================================
--- tests/two_parent_workspace_inodeprints/__driver__.lua	cb9175dd15771248cc7d53864fa77c17b9d09802
+++ tests/two_parent_workspace_inodeprints/__driver__.lua	d4c713ab7b54a3b9cfd7e9a5ba4c812409a34389
@@ -15,7 +15,7 @@ commit()
 addfile("right", "only on right")
 commit()
 
-check(mtn("merge_into_workspace", other), 0, false, false)
+check(mtn("merge-into-workspace", other), 0, false, false)
 
 -- check that we've got the expected initial status
 check(mtn("status"), 0, true, false)
@@ -44,7 +44,7 @@ remove("_MTN/inodeprints")
 check(qgrep("in-two-parent", "_MTN/inodeprints"))
 
 remove("_MTN/inodeprints")
-check(mtn("refresh_inodeprints"), 0, false, false)
+check(mtn("refresh-inodeprints"), 0, false, false)
 check(fsize("_MTN/inodeprints") ~= 0)
 check(qgrep("left", "_MTN/inodeprints"))
 check(qgrep("right", "_MTN/inodeprints"))
============================================================
--- tests/two_parent_workspace_list/__driver__.lua	65c50373573076490512bf8852e35bb671f34ff7
+++ tests/two_parent_workspace_list/__driver__.lua	5729fad7e2f95f880f2440a81d61af1ddc5d7827
@@ -20,7 +20,7 @@ right = base_revision()
 commit()
 right = base_revision()
 
-check(mtn("merge_into_workspace", left), 0, false, false)
+check(mtn("merge-into-workspace", left), 0, false, false)
 
 check(mtn("ls", "changed"), 0, "file1\nfile2\nfile3\n", nil)
 check(mtn("ls", "known"), 0, "file1\nfile2\nfile3\nfile4\n", nil)
============================================================
--- tests/two_parent_workspace_pivot_root/__driver__.lua	4cd99ef70412ee23cc86fcd2b6dce7a2c49c2bb0
+++ tests/two_parent_workspace_pivot_root/__driver__.lua	33c7699201b2a1e49302f3fbb05c91252cee3495
@@ -23,12 +23,12 @@ right = indir("w3", {base_revision})[1](
 check(indir("w3", mtn("commit", "--message", "blah-blah")), 0, false, false)
 right = indir("w3", {base_revision})[1]()
 
-check(indir("w3", mtn("merge_into_workspace", left)), 0, false, false)
+check(indir("w3", mtn("merge-into-workspace", left)), 0, false, false)
 check(qgrep("left", "w3/testfile"))
 check(qgrep("right", "w3/testfile"))
 check(not qgrep("ancestor", "w3/testfile"))
 
-check(indir("w3", mtn("pivot_root", "newroot", "oldroot")),
+check(indir("w3", mtn("pivot-root", "newroot", "oldroot")),
       0, nil, false)
 
 check(exists("w3/fileinroot"))
============================================================
--- tests/two_parent_workspace_pluck/__driver__.lua	d07e8989375d64c19851c241c7c01cb0a045c5c8
+++ tests/two_parent_workspace_pluck/__driver__.lua	f6309ae3a7a2a0cccbc94f57d0765515a8f4cda1
@@ -19,7 +19,7 @@ right = base_revision()
 commit()
 right = base_revision()
 
-check(mtn("merge_into_workspace", left), 0, false, false)
+check(mtn("merge-into-workspace", left), 0, false, false)
 check(qgrep("left", "testfile"))
 check(qgrep("right", "testfile"))
 check(not qgrep("ancestor", "testfile"))
============================================================
--- tests/unnormalized_paths_in_database/__driver__.lua	cdf29f521361c390732d47de1b64b45c167c8775
+++ tests/unnormalized_paths_in_database/__driver__.lua	41f1471c0a3b54937770ee96a714389b68f3ccad
@@ -18,4 +18,4 @@ check(mtn("db", "migrate", "-d", "bad.db
 
 check(mtn("db", "migrate", "-d", "bad.db"), 0, false, false)
 
+check(mtn("db", "regenerate-caches", "-d", "bad.db"), 3, false, true)
-check(mtn("db", "regenerate_caches", "-d", "bad.db"), 3, false, true)
============================================================
--- tests/update_to_off-branch_rev/__driver__.lua	09660e5a0d63ff6671afc6a288be58071beecd2e
+++ tests/update_to_off-branch_rev/__driver__.lua	1e0ebced2bd532c2636beab195111697465b6890
@@ -18,7 +18,7 @@ revs.n = base_revision()
 writefile("testfile", "double double")
 commit("nobranch")
 revs.n = base_revision()
-check(mtn("db", "kill_branch_certs_locally", "nobranch"))
+check(mtn("db", "kill-branch-certs-locally", "nobranch"))
 
 check(mtn("checkout", "--branch=testbranch", "--revision", revs.t, "codir"), 0, false, false)
 check(grep('^ *branch "testbranch"', "codir/_MTN/options"), 0, false, false)
============================================================
--- tests/updating_through_a_pivot_root/__driver__.lua	aab50af65ba043424b85556957569396cf687c23
+++ tests/updating_through_a_pivot_root/__driver__.lua	ab50fe4f8fa367f5e67414a5f5e9602ac6f11eee
@@ -11,7 +11,7 @@ base = indir("workspace", {base_revision
 check(indir("workspace", mtn("commit", "-m", "foo")), 0, false, false)
 base = indir("workspace", {base_revision})[1]()
 
-check(indir("workspace", mtn("pivot_root", "dir1", "old_root")), 0, false, false)
+check(indir("workspace", mtn("pivot-root", "dir1", "old_root")), 0, false, false)
 check(indir("workspace", mtn("commit", "-m", "foo")), 0, false, false)
 
 check(mtn("co", "-r", base, "testspace"), 0, false, false)
============================================================
--- tests/use_restrictions_with_--exclude_and_inodeprints/__driver__.lua	ccfd460757c86f23e4655058be414358602f1aec
+++ tests/use_restrictions_with_--exclude_and_inodeprints/__driver__.lua	bbf44905e1eaf0038566ee24a1f12710f2db93f1
@@ -9,7 +9,7 @@ check(mtn("ci", "-m", "x"), 0, false, fa
 check(mtn("add", "foo/bar"), 0, false, false)
 check(mtn("ci", "-m", "x"), 0, false, false)
 
-check(mtn("refresh_inodeprints"))
+check(mtn("refresh-inodeprints"))
 append("file1", "a")
 append("foo/bar", "b")
 check(mtn("ci", "--exclude", "foo", "-m", 'x'), 0, false, false)
============================================================
--- tests/workspace_migration/__driver__.lua	e3b4942919d5e99c74ae0098986fa216d780bf40
+++ tests/workspace_migration/__driver__.lua	bd92f0d04e7dc3d02dd90ae7c6a614de340bbd5d
@@ -1,4 +1,4 @@
--- This test ensures that 'mtn workspace_migrate' can take any old-format
+-- This test ensures that 'mtn migrate-workspace' can take any old-format
 -- workspace and move it forward to the current time; it is basically a
 -- compatibility test (see also the 'schema_migration' test).
 --
@@ -79,10 +79,10 @@ function check_migrate_from(thing, versi
       -- monotone notices and refuses to work
       check(indir(ws, mtn("status")), 1, false, true)
       -- and the error message mentions the command they should run
-      check(qgrep("migrate_workspace", "stderr"))
+      check(qgrep("migrate-workspace", "stderr"))
    end
    -- use raw_mtn here so it's not getting any help from the command line
-   check(indir(ws, raw_mtn("migrate_workspace")), 0, false, false)
+   check(indir(ws, raw_mtn("migrate-workspace")), 0, false, false)
    -- now we should be the current version, and things should work
    check(readfile(ws .. "/_MTN/format") == (current_workspace_format .. "\n"))
    check_workspace_matches_current(ws, thing .. "-current")
============================================================
--- tests/workspace_migration/inodeprints.lua	57960c6f4766c6ed3cad53c6436f4922d7c75895
+++ tests/workspace_migration/inodeprints.lua	f2575c8d9d5489e35819f9af591ba92be647f9f2
@@ -28,7 +28,7 @@ return {
 	 mkdir("newdir")
 	 writefile("newdir/file3", "twas mimsy and the borogroves\n")
 	 check(mtn("add", "newdir", "newdir/file3"), 0, false, false)
-	 check(mtn("refresh_inodeprints"))
+	 check(mtn("refresh-inodeprints"))
 	 chdir("..")
       end,
    checker =
============================================================
--- tests/workspace_migration/twoparent.lua	581c3f3571a87e4d2ab8d43f204974f31ee6c425
+++ tests/workspace_migration/twoparent.lua	23ec7ed6968004f410334bf6a2c8883d4a575701
@@ -24,7 +24,7 @@ return {
 	 commit()
 	 right = base_revision()
 
-	 check(mtn("merge_into_workspace", left), 0, false, false)
+	 check(mtn("merge-into-workspace", left), 0, false, false)
 	 chdir("..")
       end,
    checker = function (dir, refdir) end
============================================================
--- testsuite.lua	30b370324e7794c693af1e36ee7360e348a3a868
+++ testsuite.lua	98594f05af050a79f9a2665a99d077648a0c4e77
@@ -269,10 +269,10 @@ function check_same_db_contents(db1, db2
     rev = trim(rev)
     check_same_stdout(mtn("--db", db1, "automate", "certs", rev),
                       mtn("--db", db2, "automate", "certs", rev))
-    check_same_stdout(mtn("--db", db1, "automate", "get_revision", rev),
-                      mtn("--db", db2, "automate", "get_revision", rev))
-    check_same_stdout(mtn("--db", db1, "automate", "get_manifest_of", rev),
-                      mtn("--db", db2, "automate", "get_manifest_of", rev))
+    check_same_stdout(mtn("--db", db1, "automate", "get-revision", rev),
+                      mtn("--db", db2, "automate", "get-revision", rev))
+    check_same_stdout(mtn("--db", db1, "automate", "get-manifest-of", rev),
+                      mtn("--db", db2, "automate", "get-manifest-of", rev))
   end
   
   check(mtn("--db", db1, "complete", "file", ""), 0, true, false)