tests/test-merge-force.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Fri, 13 Feb 2009 11:32:33 +0100
changeset 7757 af6a63438a8a
parent 6336 4b0c9c674707
child 8545 3682a19bb637
permissions -rw-r--r--
identify: have consistent output for local repositories Also, add some extensive testing for it (hardly any in the suite so far).

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