view tests/test-merge-force.out @ 6289:91ac1726730a

issue 1003: send all data properly
author Bryan O'Sullivan <bos@serpentine.com>
date Sun, 16 Mar 2008 22:59:04 -0700
parents 69c75d063c7a
children 4b0c9c674707
line wrap: on
line source

% 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