tests/test-merge-force.out
author Martin Geisler <mg@lazybytes.net>
Mon, 04 May 2009 22:14:52 +0200
changeset 8297 7f27e69dd27f
parent 6336 4b0c9c674707
child 8545 3682a19bb637
permissions -rw-r--r--
util: stop overwriting sha1, overwrite _fastsha1 instead Some modules (like revlog) would import util.sha1 as _sha1. This defeats the purpose of having util.sha1 overwrite itself with a faster version -- revlog would end up always calling the slow version. By always delegating to util._fastsha1 we avoid this at the cost of an extra (but unconditional) indirection.

created new head
% local deleted a file, remote removed
abort: outstanding uncommitted changes
resolving manifests
removing a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should show a as removed
R a
% manifest. should not have a:
b