Mercurial > hg > gitweb
view tests/test-copy2 @ 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 | 94f38724283f |
children | c0b449154a90 |
line wrap: on
line source
#!/bin/sh hg init echo foo > foo hg add foo hg commit -m1 -d"0 0" echo "# should show copy" hg copy foo bar hg debugstate|grep '^copy' echo "# shouldn't show copy" hg commit -m2 -d"0 0" hg debugstate|grep '^copy' echo "# should match" hg debugindex .hg/data/foo.i hg debugrename bar echo bleah > foo echo quux > bar hg commit -m3 -d"0 0" echo "# should not be renamed" hg debugrename bar hg copy -f foo bar echo "# should show copy" hg debugstate|grep '^copy' hg commit -m3 -d"0 0" echo "# should show no parents for tip" hg debugindex .hg/data/bar.i echo "# should match" hg debugindex .hg/data/foo.i hg debugrename bar echo "# should show no copies" hg debugstate|grep '^copy' exit 0