tests/test-manifest-merging.out
author Patrick Mezard <pmezard@gmail.com>
Mon, 07 Dec 2009 12:44:15 -0500
branchstable
changeset 10051 a02d43acbc04
parent 9611 a3d73b3e1f8a
permissions -rw-r--r--
convert/svn: make sink recover gracefully from empty changeset Otherwise when processing a changeset that in fact changes no files (perhaps due to bug in import from CVS) can get something like: unexpected svn output: abort: unable to cope with svn output Bug report and patch draft by Jesse Glick <jesse.glick@sun.com>

% init foo-base
% create alpha in first repo
adding alpha
% clone foo-base to foo-work
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% create beta in second repo
adding beta
% create gamma in first repo
adding gamma
% pull into work and merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% revert to changeset 1 to simulate a failed merge
2 files updated, 0 files merged, 0 files removed, 0 files unresolved