Mercurial > hg

view tests/test-manifest-merging.out @ 12011:f38b0a3308b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
deltaparent(): don't return nullrev for a revision containing a full snapshot this allows us to simplify manifest.readdelta and revlog.revdiff
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 21 Aug 2010 19:30:42 +0200
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