test-confused-revert.out
28 lines
| 698 B
| text/plain
|
TextLexer
/ tests / test-confused-revert.out
Matt Mackall
|
r1449 | %%% should show a removed and b added | ||
| A b | ||||
| R a | ||||
| reverting... | ||||
Vadim Gelfer
|
r2042 | undeleting a | ||
|
Vadim Gelfer
|
r2029 | forgetting b | ||
|
Matt Mackall
|
r1449 | %%% should show b unknown and a back to normal | ||
| ? b | ||||
Thomas Arendsen Hein
|
r2175 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
Matt Mackall
|
r1449 | merging a | ||
|
Thomas Arendsen Hein
|
r2175 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
| (branch merge, don't forget to commit) | ||||
|
Matt Mackall
|
r1449 | %%% should show foo-b | ||
| foo-b | ||||
| %%% should show a removed and b added | ||||
| A b | ||||
| R a | ||||
|
Vadim Gelfer
|
r2214 | %%% revert should fail | ||
Brendan Cully
|
r3095 | abort: uncommitted merge - please provide a specific revision | ||
|
Vadim Gelfer
|
r2214 | %%% revert should be ok now | ||
|
Vadim Gelfer
|
r2042 | undeleting a | ||
|
Vadim Gelfer
|
r2029 | forgetting b | ||
|
Matt Mackall
|
r1449 | %%% should show b unknown and a marked modified (merged) | ||
Alexis S. L. Carvalho
|
r6298 | M a | ||
|
Matt Mackall
|
r1449 | ? b | ||
| %%% should show foo-b | ||||
| foo-b | ||||