test-confused-revert.out
27 lines
| 711 B
| text/plain
|
TextLexer
/ tests / test-confused-revert.out
|
r1449 | %%% should show a removed and b added | ||
A b | ||||
R a | ||||
reverting... | ||||
|
r2042 | undeleting a | ||
|
r2029 | forgetting b | ||
|
r1449 | %%% should show b unknown and a back to normal | ||
? b | ||||
|
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 | ||||
|
r1449 | merging a | ||
|
r2175 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
|
r1449 | %%% should show foo-b | ||
foo-b | ||||
%%% should show a removed and b added | ||||
A b | ||||
R a | ||||
|
r2214 | %%% revert should fail | ||
abort: working dir has two parents; you must specify the revision to revert to | ||||
%%% revert should be ok now | ||||
|
r2042 | undeleting a | ||
|
r2029 | forgetting b | ||
|
r1449 | %%% should show b unknown and a marked modified (merged) | ||
? b | ||||
%%% should show foo-b | ||||
foo-b | ||||