Mercurial > evolve
diff tests/test-evolve-abort-phasediv.t @ 3930:d00f0c369bc7 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 02:47:44 +0200 |
| parents | 629558d09898 |
| children | 537fd9a86c06 684cc3418ecd |
line wrap: on
line diff
--- a/tests/test-evolve-abort-phasediv.t Thu Aug 02 02:42:15 2018 +0200 +++ b/tests/test-evolve-abort-phasediv.t Thu Aug 02 02:47:44 2018 +0200 @@ -171,7 +171,7 @@ | () draft | x 8:9ff8adbe8a24 added c |/ () draft - | * 7:e44ebefe4f54 added d + | o 7:e44ebefe4f54 added d |/ () draft | x 6:ddba58020bc0 added d |/ () draft @@ -203,7 +203,6 @@ [1] $ hg evolve --abort - 1 new phase-divergent changesets evolve aborted working directory is now at 28cd06b3f801 @@ -212,7 +211,7 @@ | () draft | x 8:9ff8adbe8a24 added c |/ () draft - | * 7:e44ebefe4f54 added d + | o 7:e44ebefe4f54 added d |/ () draft | x 6:ddba58020bc0 added d |/ () draft @@ -241,7 +240,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 @@ -288,14 +287,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