# 
# patch "ChangeLog"
#  from [ac4b2df4b7132e8a010350e135f645ab6bb7ae7d]
#    to [181287bddd749618979457d9b21a322a97aef769]
# 
# patch "commands.cc"
#  from [e24b9d3f4cf1db10ea68ce3733c1a8bdafb5371d]
#    to [e351cc76be3dbe3eaa3d9a35f69a3efe5b09c414]
# 
# patch "database.cc"
#  from [221715fff7bde7114e97c033876cfd103d9e84ce]
#    to [39d6b99c913576436deb56633c84e9ce3c96f73d]
# 
# patch "monotone.texi"
#  from [412d8c60e2a7e06ae07a6b8350393421d7f87b2b]
#    to [939f56de6aac68a630492031939ce4654f093203]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,14 @@
+2005-04-17  Matt Johnston  <address@hidden>
+
+	* commands.cc: warn that dropkey won't truly erase the privkey
+	from the database
+	* monotone.texi: same
+
+2005-04-17  Matt Johnston  <address@hidden>
+
+	* database.cc: mention that it could be the filesystem that
+	is full in the SQLITE_FULL error message
+
 2005-04-16  Derek Scherger  <address@hidden>
 
 	* work.cc (known_preimage_path): rename to...
--- commands.cc
+++ commands.cc
@@ -1184,7 +1184,10 @@
 
   if (app.db.private_key_exists(ident))
     {
-      P(F("dropping private key '%s' from database\n") % ident);
+      P(F("dropping private key '%s' from database\n\n") % ident);
+      W(F("the private key data may not have been erased from the"));
+      W(F("database. it is recommended that you use 'db dump' and"));
+      W(F("'db load' to be sure."));
       app.db.delete_private_key(ident);
       key_deleted = true;
     }
--- database.cc
+++ database.cc
@@ -589,7 +589,7 @@
       break;
 
     case SQLITE_FULL:
-      throw oops("Insertion failed because database is full");
+      throw oops("Insertion failed because database (or filesystem) is full");
       break;
 
     case SQLITE_CANTOPEN:
--- monotone.texi
+++ monotone.texi
@@ -3813,7 +3813,10 @@
 This command drops the public and/or private key. If both exist, both
 are dropped, if only one exists, it is dropped. This command should
 be used with caution as changes are irreversible without a backup of
-the key(s) that were dropped.
+the key(s) that were dropped. Note also that the private key is not
+guaranteed to actually be erased from your database file - if you are
+going to make the database file public, you should use 'db dump'
+and 'db load' to import into a fresh database.
 
 @item monotone chkeypass @var{id}