mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +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.
35 lines
871 B
Plaintext
35 lines
871 B
Plaintext
1:f248da0d4c3e
|
|
0:9eca13a34789
|
|
f248da0d4c3e tip
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
9eca13a34789
|
|
9eca13a34789+
|
|
reverting file1
|
|
9eca13a34789
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
f248da0d4c3e tip
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
merge: warning: conflicts during merge
|
|
merging file1
|
|
merging file1 failed!
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
There are unresolved merges with locally modified files.
|
|
diff -r f248da0d4c3e file1
|
|
--- a/file1
|
|
+++ b/file1
|
|
@@ -1,3 +1,7 @@ added file1
|
|
added file1
|
|
another line of text
|
|
+<<<<<<<
|
|
+changed file1 different
|
|
+=======
|
|
changed file1
|
|
+>>>>>>>
|
|
M file1
|
|
f248da0d4c3e+ tip
|
|
reverting file1
|
|
f248da0d4c3e tip
|
|
f248da0d4c3e tip
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
f248da0d4c3e tip
|