Mercurial > hg

view tests/test-manifest-merging.out @ 10954:33119d0252c1 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: fix repo root path handling in svn subrepo
author Brett Cannon <brett@python.org>
date Sun, 18 Apr 2010 14:20:08 -0700
parents a3d73b3e1f8a
children
line wrap: on
line source

% 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