Mercurial > hg > mercurial-crew-with-dirclash

comparison 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
comparison
equal deleted inserted replaced
2952:6ba3409f9725 2954:51ba31494c69
1 % file replaced with directory
2 adding a
3 % should fail - would corrupt dirstate
4 abort: file named 'a' already in dirstate
5 % directory replaced with file
6 adding a/a
7 % should fail - would corrupt dirstate
8 abort: directory named 'a' already in dirstate
9 % directory replaced with file
10 adding b/c/d
11 % should fail - would corrupt dirstate
12 abort: directory named 'b' already in dirstate