#
#
# patch "monotone.texi"
#  from [c24cb62f61e05cf67714f4667960d21b3251ec67]
#    to [10e96b4368b322c3d7b3db9e727e04a1069a0452]
# 
# patch "tests/db_kill_rev_locally_and_recommit/__driver__.lua"
#  from [dd0ee3ba4f8f41948b81a2beeb1ce51020feb03f]
#    to [8a320f4b98d02c156ec7038419e8dba28f359dfe]
#
============================================================
--- monotone.texi	c24cb62f61e05cf67714f4667960d21b3251ec67
+++ monotone.texi	10e96b4368b322c3d7b3db9e727e04a1069a0452
@@ -5513,7 +5513,13 @@ @section Database
 This command ``kills'', i.e., deletes, a given revision, as well as any
 certs attached to it.  It has an ugly name because it is a dangerous
 command; it permanently and irrevocably deletes historical information
-from your database.  There are a number of caveats:
+from your database.  If you execute this command in a workspace, whose
+parent revision is the one you are about to delete, the killed revision
+is re-applied to this workspace which makes it possible for you to fix
+a problem and commit again later on easily. For this to work, the
+workspace may not have any changes and/or missing files.
+
+There are a number of other caveats with this command:
 @itemize
 @item
 It can only be applied to revisions that have no descendants.  If you
============================================================
--- tests/db_kill_rev_locally_and_recommit/__driver__.lua	dd0ee3ba4f8f41948b81a2beeb1ce51020feb03f
+++ tests/db_kill_rev_locally_and_recommit/__driver__.lua	8a320f4b98d02c156ec7038419e8dba28f359dfe
@@ -31,7 +31,7 @@ addfile("foo/file2", "foofile2")
 addfile("file1", "file1")
 addfile("foo/file2", "foofile2")
 
--- boom (until bug #18990 is fixed)
-xfail(mtn("commit", "-m", "recommit same id"))
+-- this should just work
+check(mtn("commit", "-m", "recommit same id"))