tests/test-manifest-merging.out
author Abderrahim Kitouni <a.kitouni@gmail.com>
Sat, 04 Jul 2009 14:18:15 +0100
changeset 9092 9aebeea7ac00
parent 6338 0750f11152fe
child 9611 a3d73b3e1f8a
permissions -rw-r--r--
subrepo: use hg.repository instead of creating localrepo directly this way, extensions' reposetup will be called, which allows for git subrepos to be handled by hg-git (and I believe the same goes for svn and hgsubversion)

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