tests/test-manifest-merging.out
author Patrick Mezard <pmezard@gmail.com>
Mon, 13 Aug 2007 19:42:52 +0200
changeset 5163 b51d07ed1b18
parent 3326 be8efb6e1cc6
child 6338 0750f11152fe
permissions -rw-r--r--
demandimport: ignore pwd and grp. Both are unavailable under Windows and tarfile detects them via ImportError.

% 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