annotate tests/test-issue322.out @ 3316:39fd6e82ea38
merge: pull user messages out to hg.py
- add _update for shadowing in clone
- add _showstats helper
- remove update parameter defaults
- move stats message and merge help messages
author |
Matt Mackall <mpm@selenic.com> |
date |
Tue, 10 Oct 2006 03:39:44 -0500 |
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
|