annotate tests/test-issue322.out @ 4722:487943b52a6c
mq: regularize patch header creation.
Do not prefix qnew patches with [mq]: when a message has been given.
Always use [mq]: as the prefix for generated commit messages.
| author |
Brendan Cully <brendan@kublai.com> |
| date |
Mon, 25 Jun 2007 15:57:01 -0700 |
| parents |
3d5547845158 |
| children |
e3dffbdc6522 |
| rev |
line source |
|
2953
|
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
|
