Mercurial > evolve
diff tests/test-evolve-abort-phasediv.t @ 4516:f54bb6eaf5e6 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 11 Apr 2019 22:44:53 +0200 |
| parents | a2fdbece7ce1 f530850c8184 |
| children |
line wrap: on
line diff
--- a/tests/test-evolve-abort-phasediv.t Thu Apr 11 22:42:14 2019 +0200 +++ b/tests/test-evolve-abort-phasediv.t Thu Apr 11 22:44:53 2019 +0200 @@ -66,7 +66,6 @@ () draft $ hg phase -r c41c793e0ef1 --public --hidden - 1 new phase-divergent changesets $ hg glog @ 6:ddba58020bc0 added d @@ -157,7 +156,6 @@ $ hg add b $ hg amend $ hg phase -r c41c793e0ef1 --public --hidden - 2 new phase-divergent changesets $ hg evolve --list e44ebefe4f54: added d @@ -186,7 +184,7 @@ | () draft | x 8:9ff8adbe8a24 added c |/ () draft - | * 7:e44ebefe4f54 added d + | o 7:e44ebefe4f54 added d |/ () draft | x 6:ddba58020bc0 added d |/ () draft @@ -217,7 +215,6 @@ [1] $ hg evolve --abort - 1 new phase-divergent changesets evolve aborted working directory is now at 28cd06b3f801 @@ -226,7 +223,7 @@ | () draft | x 8:9ff8adbe8a24 added c |/ () draft - | * 7:e44ebefe4f54 added d + | o 7:e44ebefe4f54 added d |/ () draft | x 6:ddba58020bc0 added d |/ () draft @@ -255,7 +252,7 @@ $ hg glog --hidden @ 10:ef9b72b9b42c added d | () draft - | * 9:28cd06b3f801 added c + | o 9:28cd06b3f801 added c |/ () draft | x 8:9ff8adbe8a24 added c |/ () draft @@ -301,14 +298,13 @@ [1] $ hg evolve --abort - 1 new phase-divergent changesets evolve aborted working directory is now at ef9b72b9b42c $ hg glog --hidden @ 10:ef9b72b9b42c added d | () draft - | * 9:28cd06b3f801 added c + | o 9:28cd06b3f801 added c |/ () draft | x 8:9ff8adbe8a24 added c |/ () draft