Mercurial > evolve
changeset 3910:5940e586efd9 mercurial-4.6
test-compat: backed out changeset dda5b2134b32
These change were for Mercurial 4.7 only.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 31 Jul 2018 11:46:30 +0200 |
| parents | f7afd3a158e3 |
| children | 299748f72527 |
| files | tests/test-evolve-phase-divergence.t tests/test-topic.t |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-phase-divergence.t Tue Jul 31 11:45:01 2018 +0200 +++ b/tests/test-evolve-phase-divergence.t Tue Jul 31 11:46:30 2018 +0200 @@ -115,7 +115,7 @@ searching for changes no changes found 1 new phase-divergent changesets - 1 local changesets published + 1 changesets became public $ hg glog @ 2:98bb3a6cfe1a tweak a @@ -284,7 +284,7 @@ searching for changes no changes found 1 new phase-divergent changesets - 1 local changesets published + 1 changesets became public $ hg glog @ 4:d47f2b37ed82 added bar to foo @@ -415,7 +415,7 @@ adding file changes added 1 changesets with 1 changes to 1 files new changesets b756eb10ea73 - 1 local changesets published + 1 changesets became public (run 'hg update' to get a working copy) $ hg push ../public @@ -437,7 +437,7 @@ searching for changes no changes found 1 new phase-divergent changesets - 1 local changesets published + 1 changesets became public $ hg glog @ 7:2c3560aedead foo to bar @@ -567,7 +567,7 @@ searching for changes no changes found 1 new phase-divergent changesets - 1 local changesets published + 1 changesets became public $ hg obslog -r . @ 334e300d6db5 (10) added x to x
--- a/tests/test-topic.t Tue Jul 31 11:45:01 2018 +0200 +++ b/tests/test-topic.t Tue Jul 31 11:46:30 2018 +0200 @@ -597,7 +597,7 @@ adding file changes added 3 changesets with 3 changes to 1 files new changesets 7c34953036d6:ae074045b7a7 - 1 local changesets published + 1 changesets became public active topic 'query' is now empty (run 'hg update' to get a working copy) $ hg topics