# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1155941594 25200
# Node ID 7356fa3cff2cb16a8d84cb9def9fbbd95b8d176e
# Parent  a7a9ba7a9f48474ad2a8a8492d59a9286ba6f155
add other dir/file case to test for issue322.

diff -r a7a9ba7a9f48 -r 7356fa3cff2c tests/test-issue322
--- a/tests/test-issue322	Fri Aug 18 14:49:12 2006 -0700
+++ b/tests/test-issue322	Fri Aug 18 15:53:14 2006 -0700
@@ -1,6 +1,8 @@
 #!/bin/sh
 # http://www.selenic.com/mercurial/bts/issue322
 
+echo % file replaced with directory
+
 hg init a
 cd a       
 echo a > a 
@@ -9,12 +11,35 @@
 mkdir a    
 echo a > a/a
 
-echo % should fail - will corrupt dirstate
+echo % should fail - would corrupt dirstate
 hg add a/a
+
+echo % should fail - if add succeeded, would corrupt manifest
 hg commit -mb
 
-echo % should fail - manifest is corrupt
+echo % should fail if commit succeeded - manifest is corrupt
 hg verify
+
 cd ..      
+echo % should succeed, but manifest is corrupt
+hg --debug --traceback clone a b
 
-hg --debug --traceback clone a b
+echo % directory replaced with file
+
+hg init c
+cd c
+mkdir a
+echo a > a/a
+hg commit -Ama
+
+rm -rf a
+echo a > a
+
+echo % should fail - would corrupt dirstate
+hg add a
+
+echo % should fail - if add succeeded, would corrupt manifest
+hg commit -mb a
+
+echo % should fail if commit succeeded - manifest is corrupt
+hg verify