diff -r e709e3817d7e -r d00f0c369bc7 tests/test-evolve-issue5832.t --- a/tests/test-evolve-issue5832.t Thu Aug 02 02:42:15 2018 +0200 +++ b/tests/test-evolve-issue5832.t Thu Aug 02 02:47:44 2018 +0200 @@ -69,11 +69,11 @@ |/ () draft | o 5:7014ec2829cd added a |/ () draft - | * 4:b9b387427a53 merge commit + | o 4:b9b387427a53 merge commit | |\ () draft +---o 3:9402371b436e added c and d | | () draft - | * 2:a1da0651488c added b + | o 2:a1da0651488c added b | | () draft | x 1:1b24879c5c3c added a |/ () draft @@ -90,11 +90,11 @@ |/ () draft | o 5:7014ec2829cd added a |/ () draft - | * 4:b9b387427a53 merge commit + | o 4:b9b387427a53 merge commit | |\ () draft +---x 3:9402371b436e added c and d | | () draft - | * 2:a1da0651488c added b + | o 2:a1da0651488c added b | | () draft | x 1:1b24879c5c3c added a |/ () draft @@ -193,7 +193,6 @@ $ hg ci -Aqm "added l" $ hg grab -r 1b24879c5c3c grabbing 1:1b24879c5c3c "added a" - 2 new orphan changesets $ hg up bde1d2b6b5e5 0 files updated, 0 files merged, 2 files removed, 0 files unresolved @@ -213,11 +212,11 @@ | | () draft | o 5:0a6281e212fe added l |/ () draft - | * 4:b9b387427a53 merge commit + | o 4:b9b387427a53 merge commit | |\ () draft +---o 3:9402371b436e added c and d | | () draft - | * 2:a1da0651488c added b + | o 2:a1da0651488c added b | | () draft | x 1:1b24879c5c3c added a |/ () draft @@ -236,11 +235,11 @@ | | () draft | o 5:0a6281e212fe added l |/ () draft - | * 4:b9b387427a53 merge commit + | o 4:b9b387427a53 merge commit | |\ () draft +---x 3:9402371b436e added c and d | | () draft - | * 2:a1da0651488c added b + | o 2:a1da0651488c added b | | () draft | x 1:1b24879c5c3c added a |/ () draft @@ -339,7 +338,6 @@ $ hg ci -Aqm "added l" $ hg grab -r 1b24879c5c3c grabbing 1:1b24879c5c3c "added a" - 2 new orphan changesets $ hg up bde1d2b6b5e5 0 files updated, 0 files merged, 2 files removed, 0 files unresolved @@ -359,11 +357,11 @@ | | () draft | o 5:0a6281e212fe added l |/ () draft - | * 4:b9b387427a53 merge commit + | o 4:b9b387427a53 merge commit | |\ () draft +---o 3:9402371b436e added c and d | | () draft - | * 2:a1da0651488c added b + | o 2:a1da0651488c added b | | () draft | x 1:1b24879c5c3c added a |/ () draft @@ -382,11 +380,11 @@ | | () draft | o 5:0a6281e212fe added l |/ () draft - | * 4:b9b387427a53 merge commit + | o 4:b9b387427a53 merge commit | |\ () draft +---x 3:9402371b436e added c and d | | () draft - | * 2:a1da0651488c added b + | o 2:a1da0651488c added b | | () draft | x 1:1b24879c5c3c added a |/ () draft