tests/test-manifest-merging.out
author Patrick Mezard <pmezard@gmail.com>
Sat, 06 Oct 2007 22:30:22 +0200
changeset 5405 8feb33c2d153
parent 3352 be8efb6e1cc6
permissions -rw-r--r--
Display symlink or executable bit with manifest -v New output looks like: 644 a 755 * b/a 644 @ l

% 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