Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-manifest-merging.out @ 5289:ed6df6b1c29a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prevent WSGI apps from touching sys.stdin by setting ui.interactive to False.
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 07 Sep 2007 17:38:52 +0200
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