Mercurial > hg > gitweb
view tests/test-copy @ 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 | b72562060e45 |
line wrap: on
line source
#!/bin/sh hg init echo a > a hg add a hg commit -m "1" -d "1000000 0" hg status hg copy a b hg status hg --debug commit -m "2" -d "1000000 0" echo "we should see two history entries" hg history -v echo "we should see one log entry for a" hg log a echo "this should show a revision linked to changeset 0" hg debugindex .hg/data/a.i echo "we should see one log entry for b" hg log b echo "this should show a revision linked to changeset 1" hg debugindex .hg/data/b.i echo "this should show the rename information in the metadata" hg debugdata .hg/data/b.d 0 | head -3 | tail -2 $TESTDIR/md5sum.py .hg/data/b.d hg cat b > bsum $TESTDIR/md5sum.py bsum hg cat a > asum $TESTDIR/md5sum.py asum hg verify