# 
# rename_file "tests/t_db_kill_branch_locally.at"
#          to "tests/t_db_kill_branch_certs_locally.at"
# 
# patch "ChangeLog"
#  from [e318bd9499a0c016e9f751196943fa9d1d0ecba9]
#    to [a6a10a729cc99431681bc96230e2deccb5b750d7]
# 
# patch "commands.cc"
#  from [302aac08e63acc1f48aa29adbbdeeff58b1c782f]
#    to [f9f438b353afcaa67b06616b0879e8668ecf9df4]
# 
# patch "monotone.texi"
#  from [de7980ee6d2c6321175f661d48d1d2e97fe53916]
#    to [57f3c8b8f8d59c873c5908a264328cc73923f9ca]
# 
# patch "tests/t_db_kill_branch_certs_locally.at"
#  from [dc67769b12aea0c26b6d4e3b2347c56ee99cde4b]
#    to [7821995222e42c3f8c89753df9168eebe27e0a8b]
# 
# patch "testsuite.at"
#  from [1c811c77a15a6f2e9596cbd748a52b7a38c4699c]
#    to [fe9f0a7cff2f78a911d08ffb2830971a6e1a7b11]
# 
===============================================
--- ChangeLog	e318bd9499a0c016e9f751196943fa9d1d0ecba9
+++ ChangeLog	a6a10a729cc99431681bc96230e2deccb5b750d7
@@ -1,3 +1,12 @@
+2005-07-20  Nathaniel Smith  <address@hidden>
+
+	* commands.cc (db): Rename kill_branch_locally to
+	kill_branch_certs_locally.
+	* tests/t_db_kill_branch_locally.at: Rename to...
+	* tests/t_db_kill_branch_certs_locally.at: ...this.  Update.
+	* testsuite.at: Update.
+	* monotone.texi (Database): Update.
+
 2005-07-19  Nathaniel Smith  <address@hidden>
 
 	* schema_migration.cc (migrator::migrate): Add a check for schemas
===============================================
--- commands.cc	302aac08e63acc1f48aa29adbbdeeff58b1c782f
+++ commands.cc	f9f438b353afcaa67b06616b0879e8668ecf9df4
@@ -2131,7 +2131,7 @@
     "migrate\n"
     "execute\n"
     "kill_rev_locally ID\n"
-    "kill_branch_locally BRANCH\n"
+    "kill_branch_certs_locally BRANCH\n"
     "kill_tag_locally TAG\n"
     "check\n"
     "changesetify\n"
@@ -2171,7 +2171,7 @@
         kill_rev_locally(app,idx(args, 1)());
       else if (idx(args, 0)() == "clear_epoch")
         app.db.clear_epoch(cert_value(idx(args, 1)()));
-      else if (idx(args, 0)() == "kill_branch_locally")
+      else if (idx(args, 0)() == "kill_branch_certs_locally")
         app.db.delete_branch_named(cert_value(idx(args, 1)()));
       else if (idx(args, 0)() == "kill_tag_locally")
         app.db.delete_tag_named(cert_value(idx(args, 1)()));
===============================================
--- monotone.texi	de7980ee6d2c6321175f661d48d1d2e97fe53916
+++ monotone.texi	57f3c8b8f8d59c873c5908a264328cc73923f9ca
@@ -4445,7 +4445,7 @@
 work you can extract @var{id}'s data.
 @end itemize
 
address@hidden monotone db kill_branch_locally @var{branch}
address@hidden monotone db kill_branch_certs_locally @var{branch}
 
 This command ``kills'' a branch by deleting all branch certs with that
 branch name. You should consider carefully whether you want to use it,
===============================================
--- tests/t_db_kill_branch_certs_locally.at	dc67769b12aea0c26b6d4e3b2347c56ee99cde4b
+++ tests/t_db_kill_branch_certs_locally.at	7821995222e42c3f8c89753df9168eebe27e0a8b
@@ -1,7 +1,7 @@
-AT_SETUP([db kill_branch_locally command])
+AT_SETUP([db kill_branch_certs_locally command])
 MONOTONE_SETUP
 
-# This tests the db kill_branch_locally command
+# This tests the db kill_branch_certs_locally command
 
 # Prepare a db with a couple of branches
 ADD_FILE(foo, [file named foo
@@ -14,7 +14,7 @@
 AT_CHECK(grep -q bad stdout)
 
 # Now we delete the branch, and make sure it's gone
-AT_CHECK(MONOTONE db kill_branch_locally bad, [], ignore, ignore)
+AT_CHECK(MONOTONE db kill_branch_certs_locally bad, [], ignore, ignore)
 AT_CHECK(MONOTONE ls branches, [], stdout, ignore)
 AT_CHECK(grep -q good stdout)
 AT_CHECK(grep -q bad stdout, [1])
===============================================
--- testsuite.at	1c811c77a15a6f2e9596cbd748a52b7a38c4699c
+++ testsuite.at	fe9f0a7cff2f78a911d08ffb2830971a6e1a7b11
@@ -663,7 +663,7 @@
 m4_include(tests/t_rcfile_dir.at)
 m4_include(tests/t_lua_includedir.at)
 m4_include(tests/t_existsonpath.at)
-m4_include(tests/t_db_kill_branch_locally.at)
+m4_include(tests/t_db_kill_branch_certs_locally.at)
 m4_include(tests/t_netsync_globs.at)
 m4_include(tests/t_set_default.at)
 m4_include(tests/t_netsync_read_permissions.at)