Mercurial > evolve
diff tests/test-prev-next.t @ 3106:a867d59ea97a mercurial-4.3
test-compat: revert output changes from phase renaming
We keep using the old name for the older version. test has to reflect that.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 20 Oct 2017 20:04:13 +0200 |
parents | 945a0989e41b |
children | 3024ae293732 c0ee9ddfd5ff |
line wrap: on
line diff
--- a/tests/test-prev-next.t Fri Oct 20 19:32:18 2017 +0200 +++ b/tests/test-prev-next.t Fri Oct 20 20:04:13 2017 +0200 @@ -169,7 +169,7 @@ some aspiring children $ hg amend -m 'added b (2)' - 1 new orphan changesets + 1 new unstable changesets $ hg next no children (1 unstable changesets to be evolved here, do you want --evolve?) @@ -209,7 +209,7 @@ next with ambiguity in aspiring children $ hg am -m 'added b (3)' - 2 new orphan changesets + 2 new unstable changesets $ hg next no children (2 unstable changesets to be evolved here, do you want --evolve?) @@ -251,7 +251,7 @@ $ sleep 1 $ hg next --evolve waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) - 1 new orphan changesets + 1 new unstable changesets got lock after [4-6] seconds (re) move:[2] two atop:[3] one