#
#
# patch "cmd_db.cc"
#  from [75ccf382e970ab65c43ae602d55052b7ed714ef2]
#    to [0875bc8882c861722b83089736d55d53469fa0c7]
# 
# patch "monotone.texi"
#  from [3c84beddd19020d3c84f2fddfb476d535ea18cac]
#    to [38c05c1241b957e69f860fa61b2921e19a8fa4a4]
# 
# patch "tests/add,remove,cleanup_registered_workspaces/__driver__.lua"
#  from [532ed9fe06a347389fe257f672d21b2129ca75b3]
#    to [113d8836d45c303084af212250de9ae5d866934f]
#
============================================================
--- cmd_db.cc	75ccf382e970ab65c43ae602d55052b7ed714ef2
+++ cmd_db.cc	0875bc8882c861722b83089736d55d53469fa0c7
@@ -400,7 +400,7 @@ CMD(unset, "unset", "", CMD_REF(variable
   db.clear_var(k);
 }
 
-CMD(register_workspace, "register-workspace",  "", CMD_REF(variables),
+CMD(register_workspace, "register_workspace",  "", CMD_REF(variables),
     N_("[WORKSPACE_PATH]"),
     N_("Registers a new workspace for the current database"),
     N_("This command adds WORKSPACE_PATH to the list of `known-workspaces'."),
@@ -422,7 +422,7 @@ CMD(register_workspace, "register-worksp
   db.register_workspace(workspace);
 }
 
-CMD(unregister_workspace, "unregister-workspace", "", CMD_REF(variables),
+CMD(unregister_workspace, "unregister_workspace", "", CMD_REF(variables),
     N_("[WORKSPACE_PATH]"),
     N_("Unregisters an existing workspace for the current database"),
     N_("This command removes WORKSPACE_PATH to the list of `known-workspaces'."),
@@ -444,7 +444,7 @@ CMD(unregister_workspace, "unregister-wo
   db.unregister_workspace(workspace);
 }
 
-CMD(cleanup_workspace_list, "cleanup-workspace-list", "", CMD_REF(variables), "",
+CMD(cleanup_workspace_list, "cleanup_workspace_list", "", CMD_REF(variables), "",
     N_("Removes all invalid, registered workspace paths for the current database"),
     "",
     options::opts::none)
============================================================
--- monotone.texi	3c84beddd19020d3c84f2fddfb476d535ea18cac
+++ monotone.texi	38c05c1241b957e69f860fa61b2921e19a8fa4a4
@@ -6342,7 +6342,7 @@ @section Database
 Deletes any value associated with @var{name} in @var{domain}.  See
 @ref{Vars} for more information.
 
address@hidden mtn register-workspace address@hidden
address@hidden mtn register_workspace address@hidden
 
 Registers the given workspace from the current database, so that it
 will show up in the output of @command{list databases} (the database
@@ -6351,7 +6351,7 @@ @section Database
 If no @var{workspace_path} is given, this command defaults to the
 current workspace.
 
address@hidden mtn unregister-workspace address@hidden
address@hidden mtn unregister_workspace address@hidden
 
 Unregisters the given workspace from the current database, so that it
 will no longer show up in the output of @command{list databases}.
@@ -6359,7 +6359,7 @@ @section Database
 If no @var{workspace_path} is given, this command defaults to the
 current workspace.
 
address@hidden mtn cleanup-workspace-list
address@hidden mtn cleanup_workspace_list
 
 Removes all invalid workspaces from the list of registered workspaces
 of the current database.  A workspace is considered invalid if its path
============================================================
--- tests/add,remove,cleanup_registered_workspaces/__driver__.lua	532ed9fe06a347389fe257f672d21b2129ca75b3
+++ tests/add,remove,cleanup_registered_workspaces/__driver__.lua	113d8836d45c303084af212250de9ae5d866934f
@@ -6,28 +6,28 @@ check(not qgrep("database: known-workspa
 check(mtn("ls", "vars"), 0, true, false)
 check(not qgrep("database: known-workspaces", "stdout"))
 
-check(mtn("register-workspace"), 0, false, false)
+check(mtn("register_workspace"), 0, false, false)
 check(mtn("ls", "vars"), 0, true, false)
 check(qgrep("database: known-workspaces .+/"..testname, "stdout"))
 
-check(mtn("register-workspace", "foo"), 0, false, false)
+check(mtn("register_workspace", "foo"), 0, false, false)
 check(mtn("ls", "vars"), 0, true, false)
 check(qgrep("database: known-workspaces .+/"..testname, "stdout"))
 check(qgrep(testname.."/foo", "stdout"))
 
 check(nodb_mtn("db", "init", "-d", "other.mtn"), 0, false, false)
 check(nodb_mtn("setup", "-b", "bar", "-d", "other.mtn", "bar"), 0, false, false)
-check(mtn("register-workspace", "bar"), 0, false, false)
+check(mtn("register_workspace", "bar"), 0, false, false)
 check(mtn("ls", "vars"), 0, true, false)
 check(qgrep(testname .. "/bar", "stdout"))
 
-check(mtn("register-workspace", "baz"), 0, false, false)
+check(mtn("register_workspace", "baz"), 0, false, false)
 
-check(mtn("unregister-workspace", "foo"), 0, false, false)
+check(mtn("unregister_workspace", "foo"), 0, false, false)
 check(mtn("ls", "vars"), 0, true, false)
 check(not qgrep(testname .. "/foo", "stdout"))
 
-check(mtn("cleanup-workspace-list"), 0, false, false)
+check(mtn("cleanup_workspace_list"), 0, false, false)
 check(mtn("ls", "vars"), 0, true, false)
 
 check(not qgrep(testname .. "/bar", "stdout"))