mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
29 lines
698 B
Plaintext
29 lines
698 B
Plaintext
%%% should show a removed and b added
|
|
A b
|
|
R a
|
|
reverting...
|
|
undeleting a
|
|
forgetting b
|
|
%%% should show b unknown and a back to normal
|
|
? b
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
merging a
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
%%% should show foo-b
|
|
foo-b
|
|
%%% should show a removed and b added
|
|
A b
|
|
R a
|
|
%%% revert should fail
|
|
abort: uncommitted merge - please provide a specific revision
|
|
%%% revert should be ok now
|
|
undeleting a
|
|
forgetting b
|
|
%%% should show b unknown and a marked modified (merged)
|
|
M a
|
|
? b
|
|
%%% should show foo-b
|
|
foo-b
|