Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-manifest-merging.out @ 4010:e282448d68f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
inst.reason isn't alway in the form (errno, strerror) urllib2.urlopen("foobar://foo") is an example where inst.reason is a string fix issue383
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 28 Dec 2006 01:14:12 +0100
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