mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
46d0753ec7
(including small changes to revert and backout to not show these stats with the exception of backout --merge) Show update stats (unless -q), e.g.: K files updated, L files merged, M files removed, N files unresolved Inform the user what to do after a merge: (branch merge, don't forget to commit) Inform the user what to do if a branch merge failed: There are unresolved merges, you can redo the full merge using: hg update -C X hg merge Y Inform the user what to do if a working directory merge failed: There are unresolved merges with locally modified files.
32 lines
1.1 KiB
Plaintext
32 lines
1.1 KiB
Plaintext
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
%% no merges expected
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
%% merge should fail
|
|
abort: 'b' already exists in the working dir and differs from remote
|
|
%% merge of b expected
|
|
merging for b
|
|
merging b
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
%%
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
Contents of b should be "this is file b1"
|
|
This is file b1
|
|
%% merge fails
|
|
abort: outstanding uncommitted changes
|
|
%% merge expected!
|
|
merging for b
|
|
merging b
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
%% merge of b should fail
|
|
abort: outstanding uncommitted changes
|
|
%% merge of b expected
|
|
merging for b
|
|
merging b
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|