Mercurial > hg

view tests/test-merge5.out @ 10760:bdb60057f905 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-convert-cvs: filter unstable cvs output. The order choosen by cvs to display commit is not stable when the tests are run under heavy CPU/IO load. This leads to irrelevant failures of the test suite. This changeset filters four lines impacted by this instability. The result of the conversion is still verified.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Mon, 22 Mar 2010 22:19:40 +0100
parents 68a1b9d0663e
children
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' to merge or use 'hg update -C' to discard changes)
% should succeed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved