annotate tests/test-issue322.out @ 3063:035fd2029575
git --diff: fix traceback when getting mode change
- use the manifest instead of the mode in the working dir
if the diff is against two revisions
- add a testcase
| author |
Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
| date |
Thu, 07 Sep 2006 14:12:39 +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
|
