view tests/test-changelog-exec.out @ 8669:6f0f69da003e

commands: typo in bundle abort message This error trigger if one calls bundle with the wrong parameters and it is thus not an error scripts will want to look for (they could and should ensure that they call bundle with the correct parameters).
author Martin Geisler <mg@lazybytes.net>
date Sun, 31 May 2009 18:09:19 +0200
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