tests/test-add.out
author Martin Geisler <mg@lazybytes.net>
Mon, 02 Nov 2009 21:55:59 +0100
changeset 9705 563a9c3a7d2e
parent 9468 b2310903c462
permissions -rw-r--r--
hg.1: kill spurious backslash I believe the backslash prevented asciidoc from automatically turning "(C)" into a real copyright symbol. This replacement is not done in reST in the first place.

adding a
? a
adding a
A a
adding a
A a
A a
? b
A a
A b
% should fail
b already tracked!
A a
A b
% should fail
a already tracked!
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging a
warning: conflicts during merge.
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
M a
? a.orig
% should fail
a already tracked!
M a
? a.orig
% issue683
? a.orig
R a
? a.orig
M a
? a.orig
c: No such file or directory
d: No such file or directory
M a
A c
? a.orig