Mercurial > evolve
changeset 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 | 77e3c8ab44eb |
| children | 70275407a31e |
| files | tests/test-evolve-serveronly-bundle2.t tests/test-obsolete.t tests/test-wireproto-bundle1.t tests/test-wireproto.t |
| diffstat | 4 files changed, 6 insertions(+), 6 deletions(-) [+] |
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/
--- a/tests/test-obsolete.t Wed May 17 15:49:21 2017 +0200 +++ b/tests/test-obsolete.t Wed May 17 17:16:59 2017 +0200 @@ -274,7 +274,7 @@ adding file changes added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers - (run 'hg heads .' to see heads, 'hg merge' to merge) + (run 'hg heads' to see heads, 'hg merge' to merge) $ qlog -R ../other-new 6 - 909a0fb57e5d @@ -364,7 +364,7 @@ adding file changes added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers - (run 'hg heads .' to see heads, 'hg merge' to merge) + (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up -q 7 # to check rollback update behavior $ qlog
--- a/tests/test-wireproto-bundle1.t Wed May 17 15:49:21 2017 +0200 +++ b/tests/test-wireproto-bundle1.t Wed May 17 17:16:59 2017 +0200 @@ -87,7 +87,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) $ hg -R ../other pull pulling from ssh://user@dummy/server searching for changes
--- a/tests/test-wireproto.t Wed May 17 15:49:21 2017 +0200 +++ b/tests/test-wireproto.t Wed May 17 17:16:59 2017 +0200 @@ -92,7 +92,7 @@ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) obsmarker-exchange: 139 bytes received 2 new obsolescence markers - (run 'hg heads' to see heads, 'hg merge' to merge) + (run 'hg heads' to see heads) $ hg -R ../other pull pulling from ssh://user@dummy/server searching for changes @@ -147,6 +147,6 @@ added 1 changesets with 0 changes to 1 files (+1 heads) obsmarker-exchange: 208 bytes received 1 new obsolescence markers - (run 'hg heads' to see heads, 'hg merge' to merge) + (run 'hg heads' to see heads) $ cd ..