Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-issue322.out @ 2954:51ba31494c69

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 18 Aug 2006 21:04:10 -0700
parents 3d5547845158
children e3dffbdc6522
line wrap: on
line diff
new file mode 100644
--- /dev/null
+++ b/tests/test-issue322.out
@@ -0,0 +1,12 @@
+% file replaced with directory
+adding a
+% should fail - would corrupt dirstate
+abort: file named 'a' already in dirstate
+% directory replaced with file
+adding a/a
+% should fail - would corrupt dirstate
+abort: directory named 'a' already in dirstate
+% directory replaced with file
+adding b/c/d
+% should fail - would corrupt dirstate
+abort: directory named 'b' already in dirstate