diff tests/test-issue322 @ 2953:3d5547845158

fix issue 322.
do not allow to add files that shadow files or directories already in dirstate.

--- a/tests/test-issue322	Fri Aug 18 15:53:14 2006 -0700
+++ b/tests/test-issue322	Fri Aug 18 21:03:29 2006 -0700
@@ -14,15 +14,7 @@
 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 if commit succeeded - manifest is corrupt
-hg verify
-
 cd ..      
-echo % should succeed, but manifest is corrupt
-hg --debug --traceback clone a b
 
 echo % directory replaced with file
 
@@ -38,8 +30,20 @@
 echo % should fail - would corrupt dirstate
 hg add a
 
-echo % should fail - if add succeeded, would corrupt manifest
-hg commit -mb a
+cd ..
+
+echo % directory replaced with file
 
-echo % should fail if commit succeeded - manifest is corrupt
-hg verify
+hg init d
+cd d
+mkdir b
+mkdir b/c
+echo a > b/c/d
+hg commit -Ama
+rm -rf b
+echo a > b
+
+echo % should fail - would corrupt dirstate
+hg add b
+
+exit 0