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.
17 lines
481 B
Plaintext
17 lines
481 B
Plaintext
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
pulling from ../source
|
|
abort: pretxncommit hook exited with status 1
|
|
transaction abort!
|
|
rollback completed
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
(run 'hg update' to get a working copy)
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
1 files, 2 changesets, 2 total revisions
|