# 
# 
# add_file "tests/t_revert_move_to_renamed_dir.at"
#  content [2a3f2a7fcb58451604add5cbd2461de6c8de5d7b]
# 
# patch "ChangeLog"
#  from [ee11ead3671a10f3aff46c5ba165052e17b9a6c8]
#    to [d8457fbea75cf36e30d6178ab0c779e3b6094544]
# 
# patch "testsuite.at"
#  from [22b136869381665a1e3901b1c36e66eafc9f622a]
#    to [1f60594483f6de8f4450f65b7958dc095d1030bf]
# 
============================================================
--- tests/t_revert_move_to_renamed_dir.at	2a3f2a7fcb58451604add5cbd2461de6c8de5d7b
+++ tests/t_revert_move_to_renamed_dir.at	2a3f2a7fcb58451604add5cbd2461de6c8de5d7b
@@ -0,0 +1,21 @@
+AT_SETUP([revert moving a file to a renamed directory])
+MONOTONE_SETUP
+
+# this test is a bug report
+# see http://savannah.nongnu.org/bugs/?func=detailitem&item_id=15994
+
+AT_XFAIL_IF(true)
+
+ADD_FILE(file, [file
+])
+
+AT_CHECK(mkdir dir)
+AT_CHECK(MONOTONE add dir, [], [ignore], [ignore])
+
+COMMIT(testbranch)
+
+AT_CHECK(MONOTONE --execute mv file dir, [], [ignore], [ignore])
+AT_CHECK(MONOTONE --execute mv dir foo, [], [ignore], [ignore])
+AT_CHECK(MONOTONE revert dir, [], [ignore], [ignore])
+
+AT_CLEANUP
============================================================
--- ChangeLog	ee11ead3671a10f3aff46c5ba165052e17b9a6c8
+++ ChangeLog	d8457fbea75cf36e30d6178ab0c779e3b6094544
@@ -1,3 +1,8 @@
+2006-03-04  Derek Scherger  <address@hidden>
+
+	* tests/t_revert_move_to_renamed_dir.at: new test for bug reported by Thomas Keller
+	* testsuite.at: call it
+
 2006-03-03  Derek Scherger  <address@hidden>
 
 	* restrictions.cc (check_for_missing_additions): new function
============================================================
--- testsuite.at	22b136869381665a1e3901b1c36e66eafc9f622a
+++ testsuite.at	1f60594483f6de8f4450f65b7958dc095d1030bf
@@ -788,3 +788,4 @@
 m4_include(tests/t_show_conflicts.at)
 m4_include(tests/t_merge_into_dir.at)
 m4_include(tests/t_restriction_excludes_parent.at)
+m4_include(tests/t_revert_move_to_renamed_dir.at)