Mercurial > hg > gitweb
view tests/test-unrelated-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 | dac4bd67f6c5 |
children |
line wrap: on
line source
#!/bin/sh mkdir a cd a hg init echo 123 > a hg add a hg commit -m "a" -u a -d "1000000 0" cd .. mkdir b cd b hg init echo 321 > b hg add b hg commit -m "b" -u b -d "1000000 0" hg pull ../a hg pull -f ../a hg heads