Mercurial > hg > gitweb
view tests/test-pull @ 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 | 85daa4e03b4c |
children | 83cfd95eafb5 |
line wrap: on
line source
#!/bin/sh mkdir test cd test echo foo>foo hg init hg addremove hg commit -m 1 hg verify hg serve -p 20059 -d --pid-file=hg.pid cd .. http_proxy= hg clone http://localhost:20059/ copy cd copy hg verify hg co cat foo hg manifest hg pull kill `cat ../test/hg.pid`