Mercurial > hg
view tests/test-remove.out @ 2175:b2ae81a7df29
Make hg update more verbose by default (issue12)
(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.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 02 May 2006 18:44:02 +0200 |
parents | 379ab45b91b7 |
children | 82385773df6c |
line wrap: on
line source
# HG changeset patch # User test # Node ID 8ba83d44753d6259db5ce6524974dd1174e90f47 # Parent 0000000000000000000000000000000000000000 1 diff -r 000000000000 -r 8ba83d44753d foo --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/foo Mon Jan 12 13:46:40 1970 +0000 @@ -0,0 +1,1 @@ +a # HG changeset patch # User test # Node ID a1fce69c50d97881c5c014ab23f580f720c78678 # Parent 8ba83d44753d6259db5ce6524974dd1174e90f47 2 diff -r 8ba83d44753d -r a1fce69c50d9 foo --- a/foo Mon Jan 12 13:46:40 1970 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -a changeset: 0:8ba83d44753d user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1 diff -r 000000000000 -r 8ba83d44753d foo --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/foo Mon Jan 12 13:46:40 1970 +0000 @@ -0,0 +1,1 @@ +a changeset: 1:a1fce69c50d9 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 2 diff -r 8ba83d44753d -r a1fce69c50d9 foo --- a/foo Mon Jan 12 13:46:40 1970 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -a 0 files updated, 0 files merged, 0 files removed, 0 files unresolved