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.
25 lines
613 B
Plaintext
25 lines
613 B
Plaintext
abort: Connection refused
|
|
255
|
|
copy: No such file or directory
|
|
changeset: 0:53e17d176ae6
|
|
tag: tip
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: test
|
|
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
1 files, 1 changesets, 1 total revisions
|
|
foo
|
|
pulling from old-http://localhost:20059/remote
|
|
searching for changes
|
|
no changes found
|