view tests/test-merge-force.out @ 6899:56a7a54e074f

store: simplify walking

- fold in main walking function
- eliminate recursion (especially recursive yielding!)
- eliminate default args

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