annotate tests/test-issue322.out @ 5080:73fdc8bd3ed8
Update on pull -u when heads were closed (fixes
issue666).
Patch written by Benoit Boissinot.
This should probably be improved in the future to handle long-living
branches, as joining two "other" heads will switch to that new head.
But this is not a new problem, as adding to the "other" head would have
switched to that new head, too.
| author |
Thomas Arendsen Hein <thomas@intevation.de> |
| date |
Mon, 06 Aug 2007 20:25:50 +0200 |
| 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
|
