Mercurial > hg > gitserve

view tests/test-manifest-merging.out @ 3455:c8686e3f0291

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Testing the new changegroupsubset remote function in the ssh and http protocols.
author Eric Hopper <hopper@omnifarious.org>
date Wed, 18 Oct 2006 02:14:26 -0500
parents be8efb6e1cc6
children
line wrap: on
line source

% 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