Mercurial > evolve
comparison tests/test-evolve-phase-divergence.t @ 3786:41fc764bf28c
corecompat: update the tests output to show phase update summary
eb9835014d20 in core added support to transactions to show a summary on the
phase changed during that transaction. Due to this, couple of tests output needs
to be updated. This patch does that.
While realeasing evolve, this patch should be backed out on branches where
hg<=4.6.
CORE-TEST-OUTPUT-UPDATE: eb9835014d20
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sun, 03 Jun 2018 01:59:41 +0530 |
| parents | f6979d64b9fb |
| children | dda5b2134b32 |
comparison
equal
deleted
inserted
replaced
| 3774:4736d0bb81bf | 3786:41fc764bf28c |
|---|---|
| 113 $ hg pull ../public | 113 $ hg pull ../public |
| 114 pulling from ../public | 114 pulling from ../public |
| 115 searching for changes | 115 searching for changes |
| 116 no changes found | 116 no changes found |
| 117 1 new phase-divergent changesets | 117 1 new phase-divergent changesets |
| 118 1 changesets became public | |
| 118 | 119 |
| 119 $ hg glog | 120 $ hg glog |
| 120 @ 2:98bb3a6cfe1a tweak a | 121 @ 2:98bb3a6cfe1a tweak a |
| 121 | () draft | 122 | () draft |
| 122 | o 1:4d1169d82e47 modify a | 123 | o 1:4d1169d82e47 modify a |
| 281 $ hg pull ../public | 282 $ hg pull ../public |
| 282 pulling from ../public | 283 pulling from ../public |
| 283 searching for changes | 284 searching for changes |
| 284 no changes found | 285 no changes found |
| 285 1 new phase-divergent changesets | 286 1 new phase-divergent changesets |
| 287 1 changesets became public | |
| 286 | 288 |
| 287 $ hg glog | 289 $ hg glog |
| 288 @ 4:d47f2b37ed82 added bar to foo | 290 @ 4:d47f2b37ed82 added bar to foo |
| 289 | (bm) draft | 291 | (bm) draft |
| 290 | o 3:aa071e5554e3 added foo to foo | 292 | o 3:aa071e5554e3 added foo to foo |
| 411 adding changesets | 413 adding changesets |
| 412 adding manifests | 414 adding manifests |
| 413 adding file changes | 415 adding file changes |
| 414 added 1 changesets with 1 changes to 1 files | 416 added 1 changesets with 1 changes to 1 files |
| 415 new changesets b756eb10ea73 | 417 new changesets b756eb10ea73 |
| 418 1 changesets became public | |
| 416 (run 'hg update' to get a working copy) | 419 (run 'hg update' to get a working copy) |
| 417 | 420 |
| 418 $ hg push ../public | 421 $ hg push ../public |
| 419 pushing to ../public | 422 pushing to ../public |
| 420 searching for changes | 423 searching for changes |
| 432 $ hg pull ../public | 435 $ hg pull ../public |
| 433 pulling from ../public | 436 pulling from ../public |
| 434 searching for changes | 437 searching for changes |
| 435 no changes found | 438 no changes found |
| 436 1 new phase-divergent changesets | 439 1 new phase-divergent changesets |
| 440 1 changesets became public | |
| 437 | 441 |
| 438 $ hg glog | 442 $ hg glog |
| 439 @ 7:2c3560aedead foo to bar | 443 @ 7:2c3560aedead foo to bar |
| 440 | (bm) draft | 444 | (bm) draft |
| 441 | o 6:b756eb10ea73 added bar to bar | 445 | o 6:b756eb10ea73 added bar to bar |
| 561 $ hg pull ../public | 565 $ hg pull ../public |
| 562 pulling from ../public | 566 pulling from ../public |
| 563 searching for changes | 567 searching for changes |
| 564 no changes found | 568 no changes found |
| 565 1 new phase-divergent changesets | 569 1 new phase-divergent changesets |
| 570 1 changesets became public | |
| 566 | 571 |
| 567 $ hg obslog -r . | 572 $ hg obslog -r . |
| 568 @ 334e300d6db5 (10) added x to x | 573 @ 334e300d6db5 (10) added x to x |
| 569 | | 574 | |
| 570 o 2352021b3785 (9) added x to x | 575 o 2352021b3785 (9) added x to x |