Mercurial > hg > gitweb
view tests/test-rawcommit1 @ 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 | 7544700fd931 |
children | 9fe62e2db71d |
line wrap: on
line source
#!/bin/sh hg --debug init echo this is a1 > a hg add a hg commit -m0 -d "1000000 0" echo this is b1 > b hg add b hg commit -m1 -d "1000000 0" hg manifest 1 echo this is c1 > c hg rawcommit -p 1 -d "1000000 0" -m2 c hg manifest 2 hg parents rm b hg rawcommit -p 2 -d "1000000 0" -m3 b hg manifest 3 hg parents echo this is a22 > a hg rawcommit -p 3 -d "1000000 0" -m4 a hg manifest 4 hg parents echo this is c22 > c hg rawcommit -p 1 -d "1000000 0" -m5 c hg manifest 5 hg parents # merge, but no files changed hg rawcommit -p 4 -p 5 -d "1000000 0" -m6 hg manifest 6 hg parents # no changes what-so-ever hg rawcommit -p 6 -d "1000000 0" -m7 hg manifest 7 hg parents