--- a/tests/test-issue660.t Thu Sep 16 16:12:26 2010 -0500
+++ b/tests/test-issue660.t Thu Sep 16 17:51:32 2010 -0500
@@ -18,6 +18,7 @@
$ hg add a/a
abort: file 'a' in dirstate clashes with 'a/a'
+ [255]
Removing shadow:
@@ -36,6 +37,7 @@
$ hg add b
abort: directory 'b' already in dirstate
+ [255]
Removing shadow:
@@ -58,6 +60,7 @@
$ rm -r a b
$ hg revert b/b
abort: file 'b' in dirstate clashes with 'b/b'
+ [255]
Revert all - should succeed:
@@ -110,6 +113,7 @@
$ hg add d
abort: directory 'd' already in dirstate
+ [255]
Removing shadow: