Mercurial > evolve
changeset 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 | 4736d0bb81bf |
children | dc81a788f278 |
files | tests/test-evolve-phase-divergence.t tests/test-topic.t |
diffstat | 2 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-phase-divergence.t Thu May 24 17:50:02 2018 +0530 +++ b/tests/test-evolve-phase-divergence.t Sun Jun 03 01:59:41 2018 +0530 @@ -115,6 +115,7 @@ searching for changes no changes found 1 new phase-divergent changesets + 1 changesets became public $ hg glog @ 2:98bb3a6cfe1a tweak a @@ -283,6 +284,7 @@ searching for changes no changes found 1 new phase-divergent changesets + 1 changesets became public $ hg glog @ 4:d47f2b37ed82 added bar to foo @@ -413,6 +415,7 @@ adding file changes added 1 changesets with 1 changes to 1 files new changesets b756eb10ea73 + 1 changesets became public (run 'hg update' to get a working copy) $ hg push ../public @@ -434,6 +437,7 @@ searching for changes no changes found 1 new phase-divergent changesets + 1 changesets became public $ hg glog @ 7:2c3560aedead foo to bar @@ -563,6 +567,7 @@ searching for changes no changes found 1 new phase-divergent changesets + 1 changesets became public $ hg obslog -r . @ 334e300d6db5 (10) added x to x
--- a/tests/test-topic.t Thu May 24 17:50:02 2018 +0530 +++ b/tests/test-topic.t Sun Jun 03 01:59:41 2018 +0530 @@ -597,6 +597,7 @@ adding file changes added 3 changesets with 3 changes to 1 files new changesets 7c34953036d6:ae074045b7a7 + 1 changesets became public active topic 'query' is now empty (run 'hg update' to get a working copy) $ hg topics