tests/test-add.out
author Cédric Duval <cedricduval@free.fr>
Fri, 10 Jul 2009 19:45:31 +0200
changeset 9130 335f749cc369
parent 8902 b9a8b616521d
child 9468 b2310903c462
permissions -rw-r--r--
gendoc: fall back to pure modules if C extensions are not available (issue1711)

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 up --clean' 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