##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

convert: refactor sink initialisation, to remove hardcoding of hg...
convert: refactor sink initialisation, to remove hardcoding of hg We also introduce options to explicitly set the source and destination repository types. Improve testing of corner cases a little.
Benoit Boissinot - - Load All Authors

File last commit:

r5207:212de429 default
r5441:71e7c86a default
Show More
test-add.out
29 lines | 469 B | text/plain | TextLexer
/ tests / test-add.out
History | Annotation | Raw |Copy content |Copy permalink
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
warning: conflicts during merge.
merging a
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
% should fail
a already tracked!
M a
% issue683
R a
M a