Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-manifest-merging.out @ 4709:53eca35c3aeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add option "hidden" to hgwebdir. TODO: should this option be renamed to 'hide_from_index' or maybe to 'index_ignore' (like Apache's mod_autoindex) ?
author Markus F.X.J. Oberhumer <markus@oberhumer.com>
date Mon, 25 Jun 2007 14:46:20 +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