Mercurial > evolve
diff tests/test-evolve-bumped.t @ 3591:98941c28f3e2 mercurial-4.3
test-compat: merge mercurial-4.4 into mercurial-4.3
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 21 Mar 2018 16:18:31 +0100 |
| parents | e1a230cc4527 |
| children |
line wrap: on
line diff
--- a/tests/test-evolve-bumped.t Wed Mar 21 16:06:17 2018 +0100 +++ b/tests/test-evolve-bumped.t Wed Mar 21 16:18:31 2018 +0100 @@ -49,7 +49,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets 4d1169d82e47 (run 'hg update' to get a working copy) $ hg log -r 'draft()' 1:4d1169d82e47@default(draft) modify a @@ -68,7 +67,7 @@ pulling from ../public searching for changes no changes found - 1 new phase-divergent changesets + 1 new bumped changesets $ hg evolve -a -A --phase-divergent recreate:[2] tweak a @@ -106,7 +105,7 @@ $ hg commit -m "merge" $ hg commit --amend -m "New message" $ hg phase --public 551127da2a8a --hidden - 1 new phase-divergent changesets + 1 new bumped changesets $ hg log -G @ 7:b28e84916d8c@default(draft) New message |\