Mercurial > hg
view tests/test-merge9.out @ 10760:bdb60057f905 stable
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 | b2310903c462 |
children |
line wrap: on
line source
adding bar adding foo adding quux1 adding quux2 created new head merging bar merging bar failed! merging foo and baz to baz 1 files updated, 1 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon U bar R baz 3 files updated, 0 files merged, 1 files removed, 0 files unresolved merging bar merging bar failed! merging baz and foo to baz 1 files updated, 1 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon % show unresolved U bar R baz % unmark baz % show U bar U baz M bar M baz M quux2 ? bar.orig % re-resolve baz merging baz and foo to baz % after U bar R baz % resolve all warning abort: no files or directories specified; use --all to remerge all files % resolve all merging bar warning: conflicts during merge. merging bar failed! % after U bar R baz