changeset 2950:f7bed40e259a

merge.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-issue322	Fri Aug 18 15:53:30 2006 -0700
@@ -0,0 +1,45 @@
+#!/bin/sh
+# http://www.selenic.com/mercurial/bts/issue322
+
+echo % file replaced with directory
+
+hg init a
+cd a       
+echo a > a 
+hg commit -Ama 
+rm a       
+mkdir a    
+echo a > a/a
+
+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
+
+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