test-add.out
40 lines
| 604 B
| text/plain
|
TextLexer
/ tests / test-add.out
Benoit Boissinot
|
r5207 | adding a | ||
? a | ||||
adding a | ||||
A a | ||||
Steve Losh
|
r8902 | adding a | ||
A a | ||||
Benoit Boissinot
|
r5207 | 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 | ||||
Dirkjan Ochtman
|
r6336 | created new head | ||
Matt Mackall
|
r6004 | merging a | ||
Benoit Boissinot
|
r5207 | warning: conflicts during merge. | ||
merging a failed! | ||||
0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||||
Augie Fackler
|
r7821 | use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | ||
Benoit Boissinot
|
r5207 | M a | ||
Matt Mackall
|
r6004 | ? a.orig | ||
Benoit Boissinot
|
r5207 | % should fail | ||
a already tracked! | ||||
M a | ||||
Matt Mackall
|
r6004 | ? a.orig | ||
Benoit Boissinot
|
r5207 | % issue683 | ||
Steve Losh
|
r8902 | ? a.orig | ||
Benoit Boissinot
|
r5207 | R a | ||
Matt Mackall
|
r6004 | ? a.orig | ||
Benoit Boissinot
|
r5207 | M a | ||
Matt Mackall
|
r6004 | ? a.orig | ||
Matt Mackall
|
r8679 | c: No such file or directory | ||
d: No such file or directory | ||||
Patrick Mezard
|
r5688 | M a | ||
A c | ||||
Matt Mackall
|
r6004 | ? a.orig | ||