diff -r 8bd60e09dfb4 -r a2fdbece7ce1 tests/test-prev-next.t --- a/tests/test-prev-next.t Tue Jan 22 12:55:09 2019 -0500 +++ b/tests/test-prev-next.t Tue Jan 22 12:57:25 2019 -0500 @@ -183,7 +183,6 @@ some aspiring children $ hg amend -m 'added b (2)' - 1 new orphan changesets $ hg next --no-evolve no children (1 unstable changesets to be evolved here, do you want --evolve?) @@ -230,7 +229,6 @@ next with ambiguity in aspiring children $ hg am -m 'added b (3)' - 2 new orphan changesets $ hg next --no-evolve no children (2 unstable changesets to be evolved here, do you want --evolve?) @@ -252,7 +250,7 @@ | o 6:d7f119adc759 added b (3) | - | * 5:9df671ccd2c7 added d + | o 5:9df671ccd2c7 added d | | | x 3:9ad178109a19 added b (2) |/ @@ -348,7 +346,6 @@ $ sleep 1 $ hg next --evolve waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) - 1 new orphan changesets got lock after [4-6] seconds (re) move:[2] two atop:[3] one @@ -369,7 +366,6 @@ $ echo foobar > bar $ hg add bar $ hg amend - 1 new orphan changesets $ echo babar > bar @@ -543,7 +539,6 @@ record this change to 'b'? [Ynesfdaq?] y no more change to split - 1 new orphan changesets $ hg up 3 -q $ hg log -GT "{rev}:{node|short} {desc}\n" @@ -555,18 +550,17 @@ | | | new desc - | * 2:fdc998261dcb C + | o 2:fdc998261dcb C | | | x 1:cc0edb0cc2b1 B |/ o 0:cae96ff49c84 A $ hg ci --amend -m "B modified" - 1 new orphan changesets $ hg log -GT "{rev}:{node|short} {desc}\n" @ 5:64ab03d3110c B modified | - | * 4:279f6cab32b5 B + | o 4:279f6cab32b5 B | | | | | | new desc @@ -574,7 +568,7 @@ |/ | | new desc - | * 2:fdc998261dcb C + | o 2:fdc998261dcb C | | | x 1:cc0edb0cc2b1 B |/