tests/test-manifest-merging.out
author Christian Ebert <blacktrash@gmx.net>
Fri, 06 Jul 2007 12:02:43 +0200
changeset 4874 d9e385a7a806
parent 3352 be8efb6e1cc6
permissions -rw-r--r--
Use isinstance instead of type == type

% 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