Mercurial > evolve
comparison tests/test-obsolete.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 | 2ddbdc1bab13 |
| children | 23c0bef0b5d4 |
comparison
equal
deleted
inserted
replaced
| 2397:77e3c8ab44eb | 2398:612c17c8ab69 |
|---|---|
| 272 adding changesets | 272 adding changesets |
| 273 adding manifests | 273 adding manifests |
| 274 adding file changes | 274 adding file changes |
| 275 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) | 275 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
| 276 1 new obsolescence markers | 276 1 new obsolescence markers |
| 277 (run 'hg heads .' to see heads, 'hg merge' to merge) | 277 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 278 $ qlog -R ../other-new | 278 $ qlog -R ../other-new |
| 279 6 | 279 6 |
| 280 - 909a0fb57e5d | 280 - 909a0fb57e5d |
| 281 3 | 281 3 |
| 282 - 725c380fe99b | 282 - 725c380fe99b |
| 362 adding changesets | 362 adding changesets |
| 363 adding manifests | 363 adding manifests |
| 364 adding file changes | 364 adding file changes |
| 365 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) | 365 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
| 366 1 new obsolescence markers | 366 1 new obsolescence markers |
| 367 (run 'hg heads .' to see heads, 'hg merge' to merge) | 367 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 368 | 368 |
| 369 $ hg up -q 7 # to check rollback update behavior | 369 $ hg up -q 7 # to check rollback update behavior |
| 370 $ qlog | 370 $ qlog |
| 371 7 | 371 7 |
| 372 - 159dfc9fa5d3 | 372 - 159dfc9fa5d3 |