Mercurial > hg > gitweb
view tests/test-hgignore.out @ 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 | 0d36e3d7e2ea |
children | 4e521a3ee5eb |
line wrap: on
line source
-- A dir/b.o ? a.c ? a.o ? dir/c.o ? syntax -- abort: .hgignore: invalid pattern (relre): *.o -- A dir/b.o ? .hgignore ? a.c ? syntax -- .hgignore: ignoring invalid syntax 'invalid' A dir/b.o ? .hgignore ? a.c ? a.o ? dir/c.o ? syntax -- A dir/b.o ? .hgignore ? a.c ? syntax -- A dir/b.o ? .hgignore ? a.c ? a.o ? dir/c.o -- A dir/b.o -- A b.o