view tests/test-merge-force.out @ 11996:3195cf01dfb9

revlog.revision(): don't use nullrev as the default value for the cache

I is probably a bug if the deltachain computation think there was a cache hit
at nullrev. Use None instead, this will never trigger a cache hit.

created new head
% local deleted a file, remote removed
abort: outstanding uncommitted changes (use 'hg status' to list 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