view tests/test-merge-force.out @ 7446:2d2e0be762be

convert: work around svn.ra.get_files() not releasing input buffer
author Patrick Mezard <pmezard@gmail.com>
date Sun, 30 Nov 2008 22:01:26 +0100
parents 4b0c9c674707
children 3682a19bb637
line wrap: on
line source

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