--- a/tests/test-evolve-continue.t Wed Jun 05 17:46:06 2019 +0200
+++ b/tests/test-evolve-continue.t Wed Jun 05 17:56:44 2019 +0200
@@ -38,11 +38,10 @@
$ echo bar > d
$ hg add d
$ hg amend
- 1 new orphan changesets
$ hg glog
@ 5:cb6a2ab625bb added c
| () draft
- | * 4:c41c793e0ef1 added d
+ | o 4:c41c793e0ef1 added d
| | () draft
| x 3:ca1b80f7960a added c
|/ () draft
@@ -95,12 +94,11 @@
$ echo bar > e
$ hg add e
$ hg amend
- 1 new orphan changesets
$ hg glog
@ 8:00a5c774cc37 added d
| () draft
- | * 7:ad0a59d83efe added e
+ | o 7:ad0a59d83efe added e
| | () draft
| x 6:2a4e03d422e2 added d
|/ () draft
@@ -151,7 +149,6 @@
$ echo bar > b
$ hg add b
$ hg amend
- 3 new orphan changesets
$ hg evolve --all --update
move:[2] added b
@@ -214,18 +211,17 @@
$ echo bar > h
$ hg add f h
$ hg amend
- 4 new orphan changesets
$ hg glog
@ 16:645135c5caa4 added c
| () draft
- | * 15:09becba8f97d added h
+ | o 15:09becba8f97d added h
| | () draft
- | * 14:5aa7b2bbd944 added g
+ | o 14:5aa7b2bbd944 added g
| | () draft
- | * 13:be88f889b6dc added f
+ | o 13:be88f889b6dc added f
| | () draft
- | * 12:6642d2c9176e added d
+ | o 12:6642d2c9176e added d
| | () draft
| x 11:95665a2de664 added c
|/ () draft
@@ -292,7 +288,6 @@
$ echo bar > g
$ hg add g
$ hg amend
- 2 new orphan changesets
$ hg evolve --all --update --confirm << EOF
> y
@@ -343,7 +338,6 @@
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo foobar > g
$ hg amend
- 2 new orphan changesets
$ hg next --evolve
move:[22] added g
@@ -395,14 +389,13 @@
$ hg rebase -r . -d 1
rebasing 2:29edef26570b "added c"
- 1 new orphan changesets
$ echo conflict > c
$ hg amend
$ hg log -G -T "{rev} {desc}\n"
@ 5 added c
|
- | * 3 added d, modified c
+ | o 3 added d, modified c
| |
| x 2 added c
| |