Mercurial > hg

view tests/test-changelog-exec.out @ 9899:be574a37a8ae stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: give each child its own tmp dir (issue1911) Fixes bug introduced by f8b4df4b033d (issue1911: --tmpdir plus parallel mode = fail), and also fixes the long-standing quirk that parallel mode created multiple /tmp/hgtests.XXXXXX directories. Now there is only one /tmp/hgtests.XXXXXX, with child0, child1, etc. under it.
author Greg Ward <greg@gerg.ca>
date Wed, 18 Nov 2009 22:23:11 -0500
parents 4b0c9c674707
children
line wrap: on
line source

% manifest of p2:
bar
foo

created new head
% manifest of p1:
foo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% this should not mention bar:
changeset:   3:ef2fc9b4a51b
tag:         tip
parent:      2:ed1b79f46b9a
parent:      1:d394a8db219b
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
description:
merge


   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       5      0       1 b004912a8510 000000000000 000000000000