--- a/tests/test-issue322.out Wed Aug 01 15:16:42 2007 -0700
+++ b/tests/test-issue322.out Thu Aug 02 01:56:08 2007 -0300
@@ -1,12 +1,12 @@
% file replaced with directory
adding a
% should fail - would corrupt dirstate
-abort: file named 'a' already in dirstate
+abort: file 'a' in dirstate clashes with 'a/a'
% directory replaced with file
adding a/a
% should fail - would corrupt dirstate
-abort: directory named 'a' already in dirstate
+abort: directory 'a' already in dirstate
% directory replaced with file
adding b/c/d
% should fail - would corrupt dirstate
-abort: directory named 'b' already in dirstate
+abort: directory 'b' already in dirstate