Mercurial > hg

view tests/test-merge5.out @ 6383:38485d45f947

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests.py: Only one fail message when output changed and error code. This fixes passing back fail messages mistaken for skip messages when running with parallel jobs because run_children() only expects one message per fail.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 24 Mar 2008 22:09:01 +0100
parents 0b89315d5de2
children 68a1b9d0663e
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
created new head
% should abort
abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')