--- a/tests/test-evolve-topic.t Thu Apr 11 22:42:14 2019 +0200
+++ b/tests/test-evolve-topic.t Thu Apr 11 22:44:53 2019 +0200
@@ -89,7 +89,6 @@
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo ddd >> ddd
$ hg amend
- 6 new orphan changesets
$ hg up 'desc(fff)'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo fff >> fff
@@ -100,17 +99,17 @@
|
| o 10 - {foo} d9cacd156ffc add ddd (draft)
| |
- | | * 9 - {bar} 1d964213b023 add jjj (draft)
+ | | o 9 - {bar} 1d964213b023 add jjj (draft)
| | |
- | | * 8 - {bar} fcab990f3261 add iii (draft)
+ | | o 8 - {bar} fcab990f3261 add iii (draft)
| | |
- | | * 7 - {bar} b0c2554835ac add hhh (draft)
+ | | o 7 - {bar} b0c2554835ac add hhh (draft)
| | |
- | | * 6 - {bar} c748293f1c1a add ggg (draft)
+ | | o 6 - {bar} c748293f1c1a add ggg (draft)
| | |
+---x 5 - {foo} 6a6b7365c751 add fff (draft)
| |
- * | 4 - {foo} 3969ab847d9c add eee (draft)
+ o | 4 - {foo} 3969ab847d9c add eee (draft)
| |
x | 3 - {foo} 4e3a154f38c7 add ddd (draft)
|/
@@ -144,13 +143,13 @@
|
o 10 - {foo} d9cacd156ffc add ddd (draft)
|
- | * 9 - {bar} 1d964213b023 add jjj (draft)
+ | o 9 - {bar} 1d964213b023 add jjj (draft)
| |
- | * 8 - {bar} fcab990f3261 add iii (draft)
+ | o 8 - {bar} fcab990f3261 add iii (draft)
| |
- | * 7 - {bar} b0c2554835ac add hhh (draft)
+ | o 7 - {bar} b0c2554835ac add hhh (draft)
| |
- | * 6 - {bar} c748293f1c1a add ggg (draft)
+ | o 6 - {bar} c748293f1c1a add ggg (draft)
| |
| x 5 - {foo} 6a6b7365c751 add fff (draft)
| |
@@ -256,7 +255,6 @@
o 0 - {} 199cc73e9a0b add aaa (draft)
$ hg topic -r 070c5573d8f9 bar
- 4 new orphan changesets
changed topic on 1 changesets to "bar"
$ hg up 16d6f664b17c
switching to topic bar
@@ -282,13 +280,13 @@
$ hg log --graph
@ 18 - {bar} 793eb6370b2d add fff (draft)
|
- | * 17 - {bar} 9bf430c106b7 add jjj (draft)
+ | o 17 - {bar} 9bf430c106b7 add jjj (draft)
| |
- | * 16 - {bar} d2dc89c57700 add iii (draft)
+ | o 16 - {bar} d2dc89c57700 add iii (draft)
| |
- | * 15 - {bar} 20bc4d02aa62 add hhh (draft)
+ | o 15 - {bar} 20bc4d02aa62 add hhh (draft)
| |
- | * 14 - {bar} 16d6f664b17c add ggg (draft)
+ | o 14 - {bar} 16d6f664b17c add ggg (draft)
| |
| x 13 - {foo} 070c5573d8f9 add fff (draft)
|/
@@ -318,15 +316,15 @@
working directory parent is obsolete! (20bc4d02aa62)
(use 'hg evolve' to update to its successor: d834582d9ee3)
$ hg log -Gr 14::
- * 19 - {bar} d834582d9ee3 add hhh (draft)
+ o 19 - {bar} d834582d9ee3 add hhh (draft)
|
- | * 17 - {bar} 9bf430c106b7 add jjj (draft)
+ | o 17 - {bar} 9bf430c106b7 add jjj (draft)
| |
- | * 16 - {bar} d2dc89c57700 add iii (draft)
+ | o 16 - {bar} d2dc89c57700 add iii (draft)
| |
| @ 15 - {bar} 20bc4d02aa62 add hhh (draft)
|/
- * 14 - {bar} 16d6f664b17c add ggg (draft)
+ o 14 - {bar} 16d6f664b17c add ggg (draft)
|
~
@@ -339,15 +337,13 @@
$ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase=
rebasing 16:d2dc89c57700 "add iii" (bar)
- 1 new orphan changesets
rebasing 17:9bf430c106b7 "add jjj" (bar)
- 1 new orphan changesets
$ hg log -Gr 42b49017ff90::
- * 21 - {bar} 7542e76aba2c add jjj (draft)
+ o 21 - {bar} 7542e76aba2c add jjj (draft)
|
- * 20 - {bar} 7858bd7e9906 add iii (draft)
+ o 20 - {bar} 7858bd7e9906 add iii (draft)
|
- * 19 - {bar} d834582d9ee3 add hhh (draft)
+ o 19 - {bar} d834582d9ee3 add hhh (draft)
|
| o 18 - {bar} 793eb6370b2d add fff (draft)
| |
@@ -399,17 +395,16 @@
$ echo "changes in hhh" > hhh
$ hg add hhh
$ hg ci --amend
- 4 new orphan changesets
$ hg log -G
@ 26 - {bar} 2c295936ac04 add fff (draft)
|
- | * 25 - {bar} 38a82cbb794a add jjj (draft)
+ | o 25 - {bar} 38a82cbb794a add jjj (draft)
| |
- | * 24 - {bar} 4a44eba0fdb3 add iii (draft)
+ | o 24 - {bar} 4a44eba0fdb3 add iii (draft)
| |
- | * 23 - {bar} 7acd9ea5d677 add hhh (draft)
+ | o 23 - {bar} 7acd9ea5d677 add hhh (draft)
| |
- | * 22 - {bar} 735c7bd8f133 add ggg (draft)
+ | o 22 - {bar} 735c7bd8f133 add ggg (draft)
| |
| x 18 - {bar} 793eb6370b2d add fff (draft)
|/