Mercurial > evolve
diff tests/test-evolve-serveronly-bundle2.t @ 2398:612c17c8ab69
tests: apply output changes from core fix
Mercurial core fixed a bug were the obsolete set (and all depending data) stayed
invalid after markers were merged. Fixing this bug is fixing some bad output on
the evolve side so we apply the output change.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 17 May 2017 17:16:59 +0200 |
| parents | 2d55ae0d6ce7 |
| children | 0405bbda7402 e22de367fc74 |
line wrap: on
line diff
--- a/tests/test-evolve-serveronly-bundle2.t Wed May 17 15:49:21 2017 +0200 +++ b/tests/test-evolve-serveronly-bundle2.t Wed May 17 17:16:59 2017 +0200 @@ -127,7 +127,7 @@ adding file changes added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 2 new obsolescence markers - (run 'hg heads' to see heads, 'hg merge' to merge) + (run 'hg heads' to see heads) $ cat ../errors.log $ hg -R ../other pull pulling from http://localhost:$HGPORT/