Mercurial > evolve
diff tests/test-evolve-abort-phasediv.t @ 4363:a2fdbece7ce1 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 22 Jan 2019 12:57:25 -0500 |
| parents | f9a850018daa |
| children | f54bb6eaf5e6 |
line wrap: on
line diff
--- a/tests/test-evolve-abort-phasediv.t Tue Jan 22 12:55:09 2019 -0500 +++ b/tests/test-evolve-abort-phasediv.t Tue Jan 22 12:57:25 2019 -0500 @@ -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 @@ -218,7 +216,6 @@ [1] $ hg evolve --abort - 1 new phase-divergent changesets evolve aborted working directory is now at 28cd06b3f801 @@ -227,7 +224,7 @@ | () draft | x 8:9ff8adbe8a24 added c |/ () draft - | * 7:e44ebefe4f54 added d + | o 7:e44ebefe4f54 added d |/ () draft | x 6:ddba58020bc0 added d |/ () draft @@ -256,7 +253,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 @@ -303,14 +300,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