# 
# 
# add_file "tests/t_revert_file_blocked_by_dir.at"
#  content [6b3011bc3824537a392d160030a909846b012770]
# 
# patch "ChangeLog"
#  from [c37b6f4112fa783d997cbe4b70971464a9834005]
#    to [3411601a8be55f009df7452d342e1431f41d7670]
# 
# patch "testsuite.at"
#  from [1f60594483f6de8f4450f65b7958dc095d1030bf]
#    to [acfc083352c8c2edd9482b92786d853e565ade59]
# 
============================================================
--- tests/t_revert_file_blocked_by_dir.at	6b3011bc3824537a392d160030a909846b012770
+++ tests/t_revert_file_blocked_by_dir.at	6b3011bc3824537a392d160030a909846b012770
@@ -0,0 +1,25 @@
+AT_SETUP([revert file blocked by unversioned directory])
+MONOTONE_SETUP
+
+# this test is a bug report
+#
+# reverting a file that has been replaced by a (non-versioned) directory
+# should do something sensible. I'm not sure what that is though.
+# this is almost a working copy conflict but it seems silly that revert
+# would ever encounter a conflict.
+
+AT_XFAIL_IF(true)
+
+ADD_FILE(foo, [foo
+])
+
+COMMIT(testbranch)
+
+AT_CHECK(MONOTONE --execute mv foo bar , [], [ignore], [ignore])
+
+# create directory blocking revert of foo
+AT_CHECK(mkdir foo)
+
+AT_CHECK(MONOTONE revert . ,[], [ignore], [ignore])
+
+AT_CLEANUP
============================================================
--- ChangeLog	c37b6f4112fa783d997cbe4b70971464a9834005
+++ ChangeLog	3411601a8be55f009df7452d342e1431f41d7670
@@ -1,3 +1,8 @@
+2006-03-08  Derek Scherger  <address@hidden>
+
+	* tests/t_revert_file_blocked_by_dir.at: new XFAIL test for revert
+	* testsuite.at: call it
+
 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	1f60594483f6de8f4450f65b7958dc095d1030bf
+++ testsuite.at	acfc083352c8c2edd9482b92786d853e565ade59
@@ -789,3 +789,4 @@
 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)
+m4_include(tests/t_revert_file_blocked_by_dir.at)