##// END OF EJS Templates
give better error message on non-existent mapfile (issue813)
give better error message on non-existent mapfile (issue813)

File last commit:

r6336:4b0c9c67 default
r6337:d2713d90 default
Show More
test-add.out
39 lines | 575 B | text/plain | TextLexer
adding 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
There are unresolved merges, you can redo the full merge using:
hg update -C 2
hg merge 1
M a
? a.orig
% should fail
a already tracked!
M a
? a.orig
% issue683
R a
? a.orig
M a
? a.orig
c does not exist!
d does not exist!
M a
A c
? a.orig