mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +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.
52 lines
1.3 KiB
Plaintext
52 lines
1.3 KiB
Plaintext
pulling from ../test1
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 2 changes to 2 files
|
|
(run 'hg update' to get a working copy)
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
pulling from ../test2
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
changeset: 2:b833d578451e
|
|
tag: tip
|
|
parent: 0:4536b1c2ca69
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: chmod +x a
|
|
|
|
changeset: 1:a187cb361a5a
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: a updated
|
|
|
|
changeset: 2:b833d578451e
|
|
tag: tip
|
|
parent: 0:4536b1c2ca69
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: chmod +x a
|
|
|
|
changeset: 1:a187cb361a5a
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: a updated
|
|
|
|
changeset: 0:4536b1c2ca69
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: added a b
|
|
|
|
resolving manifests
|
|
merging a
|
|
resolving a
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
-rwxr-x---
|
|
-rwxr-x---
|