view tests/test-manifest-merging.out @ 10407:2e8926e9cc32

mq: incorporate mq repo config when using --mq

For example, incoming should use the paths defined in .hg/patches/hgrc
instead of .hg/hgrc.

% init foo-base
% create alpha in first repo
adding alpha
% clone foo-base to foo-work
updating to branch default
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