tests/test-manifest-merging.out
author Lee Cantey <lcantey@gmail.com>
Mon, 18 Jun 2007 15:03:55 -0700
changeset 4626 eb99af2d845e
parent 3352 be8efb6e1cc6
permissions -rw-r--r--
Fix for demandimport.py and Windows compiled version. From Shun-ichi Goto in BTS issue 457 http://www.selenic.com/mercurial/bts/msg2780

% 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