# 
# 
# patch "ChangeLog"
#  from [3110298c15875a116104d6c862e82280bcac5ef0]
#    to [7e22a8195116b984b7014003ee0b95c6df528d95]
# 
# patch "tests/t_delete_dir.at"
#  from [103572849dde2aaa5352a7397f0626df10270f34]
#    to [734aaade26826b6fb8b2a9d56d63276d98803a48]
# 
============================================================
--- ChangeLog	3110298c15875a116104d6c862e82280bcac5ef0
+++ ChangeLog	7e22a8195116b984b7014003ee0b95c6df528d95
@@ -1,5 +1,10 @@
 2006-03-06  Timothy Brownawell  <address@hidden>
 
+	* tests/t_delete_dir.at: Check that drop on a non-empty dir
+	without --recursive doesn't work.
+
+2006-03-06  Timothy Brownawell  <address@hidden>
+
 	* app_state.{cc,hh}, options.hh, monotone.cc: Add a --recursive option.
 	* commands.cc (drop): accept --recursive
 	* work.cc (perform_deletions): obey --recursive
============================================================
--- tests/t_delete_dir.at	103572849dde2aaa5352a7397f0626df10270f34
+++ tests/t_delete_dir.at	734aaade26826b6fb8b2a9d56d63276d98803a48
@@ -33,6 +33,7 @@
 AT_CHECK(rm groundzero/rename-in)
 AT_CHECK(rm groundzero/new-file)
 
+AT_CHECK(MONOTONE drop -e groundzero, [1], [ignore], [ignore])
 AT_CHECK(MONOTONE drop --recursive -e groundzero, [], [ignore], [ignore])
 COMMIT(testbranch)
 DIR_DELETE_R=`BASE_REVISION`