# 
# add_file "tests/t_rename_file_to_dir.at"
# 
# add_file "tests/t_replace_dir_with_file.at"
# 
# add_file "tests/t_replace_file_with_dir.at"
# 
# patch "ChangeLog"
#  from [4e355cfcdc54bf476264e415cc7efff607d91fd1]
#    to [5696ebbb979c5cecd31e6d3d3d12875c7dd8f317]
# 
# patch "tests/t_rename_file_to_dir.at"
#  from []
#    to [2c57a749942a915191f822db0d390e4c9940cd88]
# 
# patch "tests/t_replace_dir_with_file.at"
#  from []
#    to [8e6eccb9b9e04de4a9601fa4a1d3d0c8ce61ece3]
# 
# patch "tests/t_replace_file_with_dir.at"
#  from []
#    to [8cdc795662782f9609d8e5620e9ce9db00103a96]
# 
# patch "testsuite.at"
#  from [098047b724b4a9cd4a1c1618759a6b955ca6c390]
#    to [2ff1ba09d6dee61900033b3d920e11262602f116]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,12 @@
 2005-04-24  Derek Scherger  <address@hidden>
 
+	* tests/t_rename_file_to_dir.at:
+	* tests/t_replace_file_with_dir.at:
+	* tests/t_replace_dir_with_file.at: new bug reports
+	* testsuite.at: include new tests
+
+2005-04-24  Derek Scherger  <address@hidden>
+
 	* app_state.{cc,hh} (app_state): add all_files flag to the constructor
 	(set_all_files): new method for setting flag
 
--- tests/t_rename_file_to_dir.at
+++ tests/t_rename_file_to_dir.at
@@ -0,0 +1,21 @@
+AT_SETUP([rename file to dir])
+MONOTONE_SETUP
+
+# this test is a bug report
+# the situation where a file is renamed to a dir should be trapped and 
+# reported with N(...) or something
+
+AT_XFAIL_IF(true)
+
+ADD_FILE(file, [file
+])
+COMMIT(testbranch)
+
+AT_CHECK(mkdir dir)
+AT_CHECK(MONOTONE rename file dir, [], [ignore], [ignore])
+AT_CHECK(MONOTONE status, [3], [ignore], [ignore])
+AT_CHECK(MONOTONE diff, [3], [ignore], [ignore])
+
+AT_CHECK(false)
+
+AT_CLEANUP
--- tests/t_replace_dir_with_file.at
+++ tests/t_replace_dir_with_file.at
@@ -0,0 +1,16 @@
+AT_SETUP([replace dir with file])
+MONOTONE_SETUP
+
+AT_CHECK(mkdir dir)
+ADD_FILE(dir/file, [file
+])
+COMMIT(testbranch)
+
+AT_CHECK(rm -rf dir)
+AT_DATA(dir, [this isn't a directory
+])
+
+AT_CHECK(MONOTONE status, [1], [ignore], [ignore])
+AT_CHECK(MONOTONE diff, [1], [ignore], [ignore])
+
+AT_CLEANUP
--- tests/t_replace_file_with_dir.at
+++ tests/t_replace_file_with_dir.at
@@ -0,0 +1,21 @@
+AT_SETUP([replace file with dir])
+MONOTONE_SETUP
+
+# this test is a bug report
+# the situation where a file is replaced by a dir should be trapped and 
+# reported with N(...) or something
+
+AT_XFAIL_IF(true)
+
+ADD_FILE(file, [file
+])
+COMMIT(testbranch)
+
+AT_CHECK(rm file)
+AT_CHECK(mkdir file)
+AT_CHECK(MONOTONE status, [3], [ignore], [ignore])
+AT_CHECK(MONOTONE diff, [3], [ignore], [ignore])
+
+AT_CHECK(false)
+
+AT_CLEANUP
--- testsuite.at
+++ testsuite.at
@@ -579,3 +579,6 @@
 m4_include(tests/t_diff_currev.at)
 m4_include(tests/t_normalized_filenames.at)
 m4_include(tests/t_inventory.at)
+m4_include(tests/t_rename_file_to_dir.at)
+m4_include(tests/t_replace_file_with_dir.at)
+m4_include(tests/t_replace_dir_with_file.at)