Mercurial > hg

comparison tests/test-issue322.out @ 5148:06154aff2b1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with -stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 08 Aug 2007 23:00:01 +0200
parents e3dffbdc6522
children
comparison
equal deleted inserted replaced
5083:f94dbc6c7eaf 5148:06154aff2b1a
1 % file replaced with directory 1 % file replaced with directory
2 adding a 2 adding a
3 % should fail - would corrupt dirstate 3 % should fail - would corrupt dirstate
4 abort: file named 'a' already in dirstate 4 abort: file 'a' in dirstate clashes with 'a/a'
5 % directory replaced with file 5 % directory replaced with file
6 adding a/a 6 adding a/a
7 % should fail - would corrupt dirstate 7 % should fail - would corrupt dirstate
8 abort: directory named 'a' already in dirstate 8 abort: directory 'a' already in dirstate
9 % directory replaced with file 9 % directory replaced with file
10 adding b/c/d 10 adding b/c/d
11 % should fail - would corrupt dirstate 11 % should fail - would corrupt dirstate
12 abort: directory named 'b' already in dirstate 12 abort: directory 'b' already in dirstate