# 
# 
# patch "tests/rename_file_to_dir/__driver__.lua"
#  from [c1536b9905bd6d8dfe87cdce66e5e3e0415ef801]
#    to [fa70ea43a4f9b4a1560d96ace0ce03a3dbfd774b]
# 
# patch "work.cc"
#  from [93f9a313b74fe8d80f401f07b0fa24651c6e88fa]
#    to [36ad5400889dd2d7a252d645de73eabccffdfef0]
# 
============================================================
--- tests/rename_file_to_dir/__driver__.lua	c1536b9905bd6d8dfe87cdce66e5e3e0415ef801
+++ tests/rename_file_to_dir/__driver__.lua	fa70ea43a4f9b4a1560d96ace0ce03a3dbfd774b
@@ -9,6 +9,6 @@ mkdir("dir")
 commit()
 
 mkdir("dir")
-xfail_if(true, mtn("rename", "file", "dir"), 1, false, false)
+check(mtn("rename", "file", "dir"), 1, false, false)
 check(mtn("status"), 0, false, false)
 check(mtn("diff"), 0, false, false)
============================================================
--- work.cc	93f9a313b74fe8d80f401f07b0fa24651c6e88fa
+++ work.cc	36ad5400889dd2d7a252d645de73eabccffdfef0
@@ -1382,6 +1382,8 @@ workspace::perform_rename(set<file_path>
       src_paths.begin()->split(s);
       N(new_roster.has_node(s),
         F("source file %s is not versioned") % s);
+      N(get_path_status(dst_path) != path::directory,
+        F("destination name %s already exists as an unversioned directory") % dst);
       renames.insert( make_pair(s, dst) );
       add_parent_dirs(dst, new_roster, nis, db, lua);
     }