tests/test-manifest-merging.out
author Brendan Cully <brendan@kublai.com>
Mon, 30 Apr 2007 08:51:59 -0700
changeset 4392 9770d260a405
parent 3352 be8efb6e1cc6
permissions -rw-r--r--
Make rm --after simply mark files as removed, unless --force is also given

% 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