tests/test-manifest-merging.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sun, 24 Dec 2006 22:55:34 +0100
changeset 3962 2b8825c94c5a
parent 3326 be8efb6e1cc6
child 6338 0750f11152fe
permissions -rw-r--r--
add date attribute to workingfilectx

% 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