# 
# 
# add_dir "tests/db_kill_rev_and_recommit"
# 
# add_file "tests/db_kill_rev_and_recommit/__driver__.lua"
#  content [dd0ee3ba4f8f41948b81a2beeb1ce51020feb03f]
# 
# patch "ChangeLog"
#  from [d8a765191b09f5dd406c998e824e97290f6464b4]
#    to [f837f02409f59150518cc87ee44364773f26cc81]
# 
# patch "testsuite.lua"
#  from [664f9d6394fe28c3a57ff1c3ca88720bc27aa223]
#    to [e6bfff711945291f9ac6aa3116ace3aaa5e1007f]
# 
============================================================
--- tests/db_kill_rev_and_recommit/__driver__.lua	dd0ee3ba4f8f41948b81a2beeb1ce51020feb03f
+++ tests/db_kill_rev_and_recommit/__driver__.lua	dd0ee3ba4f8f41948b81a2beeb1ce51020feb03f
@@ -0,0 +1,37 @@
+mtn_setup()
+
+addfile("base", "base")
+commit()
+base = base_revision()
+
+
+-- create a new child of base with some new content and commit
+mkdir("test1")
+chdir("test1")
+check(mtn("checkout", "--revision", base, "."))
+
+mkdir("foo")
+addfile("file1", "file1")
+addfile("foo/file2", "foofile2")
+
+commit()
+new_rev1 = base_revision()
+
+chdir("..")
+
+-- kill_rev_locally the new child
+check(mtn("db", "kill_rev_locally", new_rev1))
+
+-- recreate and attempt to commit the same child again from base
+mkdir("test2")
+chdir("test2")
+check(mtn("checkout", "--revision", base, "."))
+
+mkdir("foo")
+addfile("file1", "file1")
+addfile("foo/file2", "foofile2")
+
+-- boom (until bug #18990 is fixed)
+xfail(mtn("commit", "-m", "recommit same id"))
+
+
============================================================
--- ChangeLog	d8a765191b09f5dd406c998e824e97290f6464b4
+++ ChangeLog	f837f02409f59150518cc87ee44364773f26cc81
@@ -1,3 +1,9 @@
+2007-02-07  Daniel Carosone  <address@hidden>
+
+	* tests/db_kill_rev_and_recommit/__driver__.lua/: add a test
+	(xfail'ed, until fixed) for a bug (#18990) I just tripped over,
+	whereby db_kill_rev_locally doesn't seem to kill enough.
+	
 2007-02-07  Markus Schiltknecht  <address@hidden>
 
 	* tests/test_a_merge_8/__driver__.lua: added xfail() and a bug id,
============================================================
--- testsuite.lua	664f9d6394fe28c3a57ff1c3ca88720bc27aa223
+++ testsuite.lua	e6bfff711945291f9ac6aa3116ace3aaa5e1007f
@@ -704,3 +704,4 @@ table.insert(tests, "magic__MTN_in_restr
 table.insert(tests, "ls_unknown_in_subdir")
 table.insert(tests, "test_a_merge_8")
 table.insert(tests, "magic__MTN_in_restrictions")
+table.insert(tests, "db_kill_rev_and_recommit")