#
#
# patch "cmd_key_cert.cc"
#  from [ae73921f70c905490b54e33156b32d8ee9624090]
#    to [61d7c1ea826e6be73b4ca78aa619ebfd330f9dff]
# 
# patch "monotone.texi"
#  from [d73e2cb43685e67e7ab0dc49fbbb0dc3fbb13338]
#    to [917f28e0eb2b7bbb3d4922872add167f820da0a4]
# 
# patch "tests/changing_passphrase_of_a_private_key/__driver__.lua"
#  from [3b10e8217e21a0eec49c8be8e3edaca70c3f4e2b]
#    to [ac936884d27af8c57029e69528d8d748025a6ce6]
#
============================================================
--- cmd_key_cert.cc	ae73921f70c905490b54e33156b32d8ee9624090
+++ cmd_key_cert.cc	61d7c1ea826e6be73b4ca78aa619ebfd330f9dff
@@ -95,7 +95,7 @@ CMD(dropkey, N_("key and cert"), N_("KEY
   N(key_deleted, fmt % idx(args, 0)());
 }
 
-CMD(chkeypass, N_("key and cert"), N_("KEYID"),
+CMD(passphrase, N_("key and cert"), N_("KEYID"),
     N_("change passphrase of a private RSA key"),
     options::opts::none)
 {
============================================================
--- monotone.texi	d73e2cb43685e67e7ab0dc49fbbb0dc3fbb13338
+++ monotone.texi	917f28e0eb2b7bbb3d4922872add167f820da0a4
@@ -5109,7 +5109,7 @@ @section Key and Cert Trust
 be used with caution as changes are irreversible without a backup of
 the key(s) that were dropped.
 
address@hidden mtn chkeypass @var{id}
address@hidden mtn passphrase @var{id}
 
 This command lets you change the passphrase of the private half of the
 key @var{id}.
============================================================
--- tests/changing_passphrase_of_a_private_key/__driver__.lua	3b10e8217e21a0eec49c8be8e3edaca70c3f4e2b
+++ tests/changing_passphrase_of_a_private_key/__driver__.lua	ac936884d27af8c57029e69528d8d748025a6ce6
@@ -7,16 +7,16 @@ check(mtn("genkey", tkey), 0, false, fal
 check(mtn("genkey", tkey), 0, false, false, string.rep(tkey.."\n", 2))
 
 -- fail to enter any passphrase
-check(mtn("chkeypass", tkey), 1, false, false)
+check(mtn("passphrase", tkey), 1, false, false)
 
 -- fail to give correct old passphrase
-check(mtn("chkeypass", tkey), 1, false, false, string.rep("bad\n", 3))
+check(mtn("passphrase", tkey), 1, false, false, string.rep("bad\n", 3))
 
 -- fail to repeat new password
-check(mtn("chkeypass", tkey), 1, false, false, tkey.."\n"..tkey.."-new\nbad\n\nnew\nbad")
+check(mtn("passphrase", tkey), 1, false, false, tkey.."\n"..tkey.."-new\nbad\n\nnew\nbad")
 
 -- change the passphrase successfully
-check(mtn("chkeypass", tkey), 0, false, false, tkey.."\n"..string.rep(tkey.."-new\n", 2))
+check(mtn("passphrase", tkey), 0, false, false, tkey.."\n"..string.rep(tkey.."-new\n", 2))
 
 -- check that the passphrase changed
+check(mtn("passphrase", tkey), 0, false, false, tkey.."-new\n"..string.rep(tkey.."\n",2))
-check(mtn("chkeypass", tkey), 0, false, false, tkey.."-new\n"..string.rep(tkey.."\n",2))