Mercurial > hg
view tests/test-rename-merge1 @ 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 | 6c82beaaa11a |
children |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo "[merge]" >> .hg/hgrc echo "followcopies = 1" >> .hg/hgrc echo foo > a echo foo > a2 hg add a a2 hg ci -m "start" hg mv a b hg mv a2 b2 hg ci -m "rename" echo "checkout" hg co 0 echo blahblah > a echo blahblah > a2 hg mv a2 c2 hg ci -m "modify" echo "merge" hg merge -y --debug hg status -AC cat b hg ci -m "merge" hg debugindex .hg/store/data/b.i hg debugrename b