Mercurial > hg

view tests/test-manifest-merging.out @ 10438:e6dc44147234

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util: add any() and all() functions for Python 2.4 compatibility This patch adds these two very useful functions to the mercurial.util module, because they are not present in Python 2.4.
author Steve Losh <steve@stevelosh.com>
date Fri, 12 Feb 2010 19:59:09 -0500
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