tests/test-manifest-merging.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 01 Dec 2006 23:16:12 +0100
changeset 3754 cd25a4a1a265
parent 3352 be8efb6e1cc6
permissions -rw-r--r--
Improve error message for unknown revlog flags. Old: unknown flags 120000 for ... New: unknown flags 0x0012 for ...

% 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