Mercurial > evolve
diff tests/test-evolve-bumped.t @ 3013:945a0989e41b
packaging: merge stable back into default
6.7.0 has been released.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 27 Sep 2017 16:26:30 +0200 |
| parents | bd7e8be29542 |
| children | 8feb2cae7eae |
line wrap: on
line diff
--- a/tests/test-evolve-bumped.t Wed Sep 27 16:24:44 2017 +0200 +++ b/tests/test-evolve-bumped.t Wed Sep 27 16:26:30 2017 +0200 @@ -67,7 +67,7 @@ pulling from ../public searching for changes no changes found - 1 new bumped changesets + 1 new phase-divergent changesets $ hg evolve -a -A --phasedivergent recreate:[2] tweak a @@ -105,7 +105,7 @@ $ hg commit -m "merge" $ hg commit --amend -m "New message" $ hg phase --public 551127da2a8a --hidden - 1 new bumped changesets + 1 new phase-divergent changesets $ hg log -G @ 7:b28e84916d8c@default(draft) New message |\