tests/test-manifest-merging.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 01 Jun 2007 19:49:09 +0200
changeset 4474 08ae451148b2
parent 3352 be8efb6e1cc6
permissions -rw-r--r--
merge with stable

% init foo-base
% create alpha in first repo
adding alpha
% clone foo-base to foo-work
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