Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-manifest-merging.out @ 3572:fe03c9a476f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
log speedup: use only ui.write in changeset_printer.show - ui.status is not very useful, since this code is never executed when ui.quiet is true. - explicitly checking for ui.debug allows a regular hg log to run without looking at the manifest index - the calls to ui.note were converted for consistency
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 28 Oct 2006 20:21:54 -0300
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