mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 08:47:12 +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.
63 lines
1.7 KiB
Plaintext
63 lines
1.7 KiB
Plaintext
# creating 'remote'
|
|
# clone remote
|
|
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
|
|
# verify
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
1 files, 1 changesets, 1 total revisions
|
|
# empty default pull
|
|
default = ssh://user@dummy/remote
|
|
pulling from ssh://user@dummy/remote
|
|
searching for changes
|
|
no changes found
|
|
# local change
|
|
# updating rc
|
|
# find outgoing
|
|
searching for changes
|
|
changeset: 1:c54836a570be
|
|
tag: tip
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: add
|
|
|
|
# find incoming on the remote side
|
|
searching for changes
|
|
changeset: 1:c54836a570be
|
|
tag: tip
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: add
|
|
|
|
# push
|
|
pushing to ssh://user@dummy/remote
|
|
searching for changes
|
|
remote: adding changesets
|
|
remote: adding manifests
|
|
remote: adding file changes
|
|
remote: added 1 changesets with 1 changes to 1 files
|
|
# check remote tip
|
|
changeset: 1:c54836a570be
|
|
tag: tip
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: add
|
|
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
1 files, 2 changesets, 2 total revisions
|
|
bleah
|
|
Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5:
|
|
Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5:
|
|
Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5:
|
|
Got arguments 1:user@dummy 2:hg -R local serve --stdio 3: 4: 5:
|
|
Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5:
|