Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 02 May 2006 14:38:32 -0700] rev 2178
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 02 May 2006 14:37:55 -0700] rev 2177
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 02 May 2006 14:30:00 -0700] rev 2176
fix file handling bugs on windows.
add util.posixfile class that has posix semantics on windows.
fix util.rename so it works with stupid windows delete semantics.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 02 May 2006 18:44:02 +0200] rev 2175
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.