Mercurial > evolve

changeset 6042:1cbafebe874b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add {instabilities} to the common glog alias
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 21 Sep 2021 22:11:31 +0300
parents 6b7ef731141b
children b1a04ff0f99e
files tests/test-evolve-abort-orphan.t tests/test-evolve-abort-phasediv.t tests/test-evolve-content-divergent-interrupted.t tests/test-evolve-continue.t tests/test-evolve-issue5832.t tests/test-evolve-issue5881.t tests/test-evolve-noupdate.t tests/test-evolve-orphan-merge.t tests/test-evolve-orphan-split.t tests/test-evolve-stop-orphan.t tests/test-evolve-stop-phasediv.t tests/testlib/common.sh
diffstat 12 files changed, 119 insertions(+), 119 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-abort-orphan.t	Mon Sep 20 20:47:31 2021 +0300
+++ b/tests/test-evolve-abort-orphan.t	Tue Sep 21 22:11:31 2021 +0300
@@ -135,7 +135,7 @@
   @  5:e93a9161a274 added c
   |   () draft
   | *  4:c41c793e0ef1 added d
-  | |   () draft
+  | |   () draft orphan
   | x  3:ca1b80f7960a added c
   |/    () draft
   o  2:b1661037fa25 added b
@@ -216,9 +216,9 @@
   o  7:125af0ed8cae added a
   |   () draft
   | *  6:e83de241f751 added d
-  | |   () draft
+  | |   () draft orphan
   | %  5:e93a9161a274 added c
-  | |   () draft
+  | |   () draft orphan
   | x  2:b1661037fa25 added b
   | |   () draft
   | x  1:c7586e2a9264 added a
@@ -235,11 +235,11 @@
   @  7:125af0ed8cae added a
   |   () draft
   | *  6:e83de241f751 added d
-  | |   () draft
+  | |   () draft orphan
   | *  5:e93a9161a274 added c
-  | |   () draft
+  | |   () draft orphan
   | *  2:b1661037fa25 added b
-  | |   () draft
+  | |   () draft orphan
   | x  1:c7586e2a9264 added a
   |/    () draft
   o  0:8fa14d15e168 added hgignore
@@ -314,13 +314,13 @@
   @  7:807e8e2ca559 added a
   |   () draft
   | %  6:8f20d4390c21 foo to a
-  | |   () draft
+  | |   () draft orphan
   | | *  5:bcb1c47f8520 added d
-  | | |   () draft
+  | | |   () draft orphan
   | | x  4:86d2603075a3 added c
   | |/    () draft
   | | *  3:17509928e5bf added c
-  | | |   () draft
+  | | |   () draft orphan
   | | x  2:9f0c80a55ddc added b
   | |/    () draft
   | x  1:2f913b0c9220 added a
@@ -337,15 +337,15 @@
   @  7:807e8e2ca559 added a
   |   () draft
   | *  6:8f20d4390c21 foo to a
-  | |   () draft
+  | |   () draft orphan
   | | *  5:bcb1c47f8520 added d
-  | | |   () draft
+  | | |   () draft orphan
   | | *  4:86d2603075a3 added c
-  | |/    () draft
+  | |/    () draft orphan
   | | *  3:17509928e5bf added c
-  | | |   () draft
+  | | |   () draft orphan
   | | *  2:9f0c80a55ddc added b
-  | |/    () draft
+  | |/    () draft orphan
   | x  1:2f913b0c9220 added a
   |/    () draft
   o  0:8fa14d15e168 added hgignore
@@ -380,13 +380,13 @@
   @  7:807e8e2ca559 added a
   |   () draft
   | %  6:8f20d4390c21 foo to a
-  | |   () draft
+  | |   () draft orphan
   | | *  5:bcb1c47f8520 added d
-  | | |   () draft
+  | | |   () draft orphan
   | | x  4:86d2603075a3 added c
   | |/    () draft
   | | *  3:17509928e5bf added c
-  | | |   () draft
+  | | |   () draft orphan
   | | x  2:9f0c80a55ddc added b
   | |/    () draft
   | x  1:2f913b0c9220 added a
@@ -467,7 +467,7 @@
   @  7:807e8e2ca559 added a
   |   () draft
   | %  6:8f20d4390c21 foo to a
-  | |   () draft
+  | |   () draft orphan
   | x  1:2f913b0c9220 added a
   |/    () draft
   o  0:8fa14d15e168 added hgignore
@@ -511,9 +511,9 @@
   @  4:a0086c17bfc7 added a
   |   () draft
   | *  3:17509928e5bf added c
-  | |   () draft
+  | |   () draft orphan
   | *  2:9f0c80a55ddc added b
-  | |   (bm1) draft
+  | |   (bm1) draft orphan
   | x  1:2f913b0c9220 added a
   |/    () draft
   o  0:8fa14d15e168 added hgignore
@@ -537,7 +537,7 @@
   o  4:a0086c17bfc7 added a
   |   () draft
   | %  3:17509928e5bf added c
-  | |   () draft
+  | |   () draft orphan
   | x  2:9f0c80a55ddc added b
   | |   () draft
   | x  1:2f913b0c9220 added a
@@ -554,9 +554,9 @@
   @  4:a0086c17bfc7 added a
   |   () draft
   | *  3:17509928e5bf added c
-  | |   () draft
+  | |   () draft orphan
   | *  2:9f0c80a55ddc added b
-  | |   (bm1) draft
+  | |   (bm1) draft orphan
   | x  1:2f913b0c9220 added a
   |/    () draft
   o  0:8fa14d15e168 added hgignore
--- a/tests/test-evolve-abort-phasediv.t	Mon Sep 20 20:47:31 2021 +0300
+++ b/tests/test-evolve-abort-phasediv.t	Tue Sep 21 22:11:31 2021 +0300
@@ -86,7 +86,7 @@
 
   $ hg glog
   @  6:ddba58020bc0 added d
-  |   () draft
+  |   () draft phase-divergent
   | o  4:c41c793e0ef1 added d
   | |   () public
   | o  3:ca1b80f7960a added c
@@ -138,7 +138,7 @@
 
   $ hg glog
   @  6:ddba58020bc0 added d
-  |   () draft
+  |   () draft phase-divergent
   | o  4:c41c793e0ef1 added d
   | |   () public
   | o  3:ca1b80f7960a added c
@@ -192,11 +192,11 @@
 
   $ hg glog --hidden
   @  9:28cd06b3f801 added c
-  |   () draft
+  |   () draft phase-divergent
   | x  8:9ff8adbe8a24 added c
   |/    () draft
   | *  7:e44ebefe4f54 added d
-  |/    () draft
+  |/    () draft phase-divergent
   | x  6:ddba58020bc0 added d
   |/    () draft
   | x  5:cfe30edc6125 added d
@@ -233,11 +233,11 @@
 
   $ hg glog --hidden
   @  9:28cd06b3f801 added c
-  |   () draft
+  |   () draft phase-divergent
   | x  8:9ff8adbe8a24 added c
   |/    () draft
   | *  7:e44ebefe4f54 added d
-  |/    () draft
+  |/    () draft phase-divergent
   | x  6:ddba58020bc0 added d
   |/    () draft
   | x  5:cfe30edc6125 added d
@@ -264,9 +264,9 @@
 
   $ hg glog --hidden
   @  10:ef9b72b9b42c added d
-  |   () draft
+  |   () draft phase-divergent
   | *  9:28cd06b3f801 added c
-  |/    () draft
+  |/    () draft phase-divergent
   | x  8:9ff8adbe8a24 added c
   |/    () draft
   | x  7:e44ebefe4f54 added d
@@ -319,9 +319,9 @@
 
   $ hg glog --hidden
   @  10:ef9b72b9b42c added d
-  |   () draft
+  |   () draft phase-divergent
   | *  9:28cd06b3f801 added c
-  |/    () draft
+  |/    () draft phase-divergent
   | x  8:9ff8adbe8a24 added c
   |/    () draft
   | x  7:e44ebefe4f54 added d
--- a/tests/test-evolve-content-divergent-interrupted.t	Mon Sep 20 20:47:31 2021 +0300
+++ b/tests/test-evolve-content-divergent-interrupted.t	Tue Sep 21 22:11:31 2021 +0300
@@ -67,9 +67,9 @@
   2 new content-divergent changesets
   $ hg glog --hidden
   @  6:9c1631e352d9 added d
-  |   () draft
+  |   () draft content-divergent
   | *  5:e49523854bc8 added d
-  |/    () draft
+  |/    () draft content-divergent
   | x  4:c41c793e0ef1 added d
   |/    () draft
   o  3:ca1b80f7960a added c
@@ -130,9 +130,9 @@
 
   $ hg glog --hidden
   @  6:9c1631e352d9 added d
-  |   () draft
+  |   () draft content-divergent
   | *  5:e49523854bc8 added d
-  |/    () draft
+  |/    () draft content-divergent
   | x  4:c41c793e0ef1 added d
   |/    () draft
   o  3:ca1b80f7960a added c
@@ -167,17 +167,17 @@
 
   $ hg glog --hidden
   @  10:491e10505bae added c
-  |   () draft
+  |   () draft content-divergent
   | x  9:7398f702a162 added c
   |/    () draft
   | *  8:2ba73e31f264 added c
-  |/    () draft
+  |/    () draft content-divergent
   | *  7:f0f1694f123e added d
-  | |   () draft
+  | |   () draft orphan content-divergent
   | | x  6:9c1631e352d9 added d
   | |/    () draft
   | | *  5:e49523854bc8 added d
-  | |/    () draft
+  | |/    () draft orphan content-divergent
   | | x  4:c41c793e0ef1 added d
   | |/    () draft
   | x  3:ca1b80f7960a added c
@@ -214,17 +214,17 @@
 
   $ hg glog --hidden
   @  10:491e10505bae added c
-  |   () draft
+  |   () draft content-divergent
   | x  9:7398f702a162 added c
   |/    () draft
   | *  8:2ba73e31f264 added c
-  |/    () draft
+  |/    () draft content-divergent
   | *  7:f0f1694f123e added d
-  | |   () draft
+  | |   () draft orphan content-divergent
   | | x  6:9c1631e352d9 added d
   | |/    () draft
   | | *  5:e49523854bc8 added d
-  | |/    () draft
+  | |/    () draft orphan content-divergent
   | | x  4:c41c793e0ef1 added d
   | |/    () draft
   | x  3:ca1b80f7960a added c
@@ -297,9 +297,9 @@
 
   $ hg glog
   @  8:a8673909e314 added d
-  |   () draft
+  |   () draft content-divergent
   | *  7:6f7eaf1944c0 added d
-  | |   () draft
+  | |   () draft content-divergent
   o |  4:33c16a2e0eb8 added c
   | |   () draft
   o |  2:b1661037fa25 added b
@@ -326,9 +326,9 @@
 
   $ hg glog
   @  8:a8673909e314 added d
-  |   () draft
+  |   () draft content-divergent
   | *  7:6f7eaf1944c0 added d
-  | |   () draft
+  | |   () draft content-divergent
   o |  4:33c16a2e0eb8 added c
   | |   () draft
   o |  2:b1661037fa25 added b
@@ -350,9 +350,9 @@
 
   $ hg glog
   @  9:b6a3f3ee0c44 added d
-  |   () draft
+  |   () draft content-divergent
   | *  8:a8673909e314 added d
-  | |   () draft
+  | |   () draft content-divergent
   | o  4:33c16a2e0eb8 added c
   | |   () draft
   | o  2:b1661037fa25 added b
@@ -397,9 +397,9 @@
 
   $ hg glog
   @  9:b6a3f3ee0c44 added d
-  |   () draft
+  |   () draft content-divergent
   | *  8:a8673909e314 added d
-  | |   () draft
+  | |   () draft content-divergent
   | o  4:33c16a2e0eb8 added c
   | |   () draft
   | o  2:b1661037fa25 added b
@@ -458,9 +458,9 @@
   2 new content-divergent changesets
   $ hg glog --hidden
   @  6:9c1631e352d9 added d
-  |   () draft
+  |   () draft content-divergent
   | *  5:e49523854bc8 added d
-  |/    () draft
+  |/    () draft content-divergent
   | x  4:c41c793e0ef1 added d
   |/    () draft
   o  3:ca1b80f7960a added c
@@ -489,9 +489,9 @@
 
   $ hg glog --hidden
   @  6:9c1631e352d9 added d
-  |   () draft
+  |   () draft content-divergent
   | *  5:e49523854bc8 added d
-  |/    () draft
+  |/    () draft content-divergent
   | x  4:c41c793e0ef1 added d
   |/    () draft
   o  3:ca1b80f7960a added c
@@ -512,9 +512,9 @@
 
   $ hg glog
   @  7:517d4375cb72 added d
-  |   () draft
+  |   () draft content-divergent
   | *  5:e49523854bc8 added d
-  | |   () draft
+  | |   () draft content-divergent
   | o  3:ca1b80f7960a added c
   | |   () draft
   | o  2:b1661037fa25 added b
@@ -542,9 +542,9 @@
 
   $ hg glog
   @  7:517d4375cb72 added d
-  |   () draft
+  |   () draft content-divergent
   | *  5:e49523854bc8 added d
-  | |   () draft
+  | |   () draft content-divergent
   | o  3:ca1b80f7960a added c
   | |   () draft
   | o  2:b1661037fa25 added b
@@ -572,11 +572,11 @@
   $ hg amend
   $ hg glog
   @  10:0892835a581f added d
-  |   () draft
+  |   () draft content-divergent
   o  8:33c16a2e0eb8 added c
   |   () draft
   | *  7:517d4375cb72 added d
-  | |   () draft
+  | |   () draft content-divergent
   o |  2:b1661037fa25 added b
   |/    () draft
   o  1:c7586e2a9264 added a
@@ -618,11 +618,11 @@
 
   $ hg glog
   @  10:0892835a581f added d
-  |   () draft
+  |   () draft content-divergent
   o  8:33c16a2e0eb8 added c
   |   () draft
   | *  7:517d4375cb72 added d
-  | |   () draft
+  | |   () draft content-divergent
   o |  2:b1661037fa25 added b
   |/    () draft
   o  1:c7586e2a9264 added a
--- a/tests/test-evolve-continue.t	Mon Sep 20 20:47:31 2021 +0300
+++ b/tests/test-evolve-continue.t	Tue Sep 21 22:11:31 2021 +0300
@@ -51,7 +51,7 @@
   @  5:cb6a2ab625bb added c
   |   () draft
   | *  4:c41c793e0ef1 added d
-  | |   () draft
+  | |   () draft orphan
   | x  3:ca1b80f7960a added c
   |/    () draft
   o  2:b1661037fa25 added b
@@ -111,7 +111,7 @@
   @  8:00a5c774cc37 added d
   |   () draft
   | *  7:ad0a59d83efe added e
-  | |   () draft
+  | |   () draft orphan
   | x  6:2a4e03d422e2 added d
   |/    () draft
   o  5:cb6a2ab625bb added c
@@ -235,13 +235,13 @@
   @  16:645135c5caa4 added c
   |   () draft
   | *  15:09becba8f97d added h
-  | |   () draft
+  | |   () draft orphan
   | *  14:5aa7b2bbd944 added g
-  | |   () draft
+  | |   () draft orphan
   | *  13:be88f889b6dc added f
-  | |   () draft
+  | |   () draft orphan
   | *  12:6642d2c9176e added d
-  | |   () draft
+  | |   () draft orphan
   | x  11:95665a2de664 added c
   |/    () draft
   o  10:87f748868183 added b
--- a/tests/test-evolve-issue5832.t	Mon Sep 20 20:47:31 2021 +0300
+++ b/tests/test-evolve-issue5832.t	Tue Sep 21 22:11:31 2021 +0300
@@ -70,11 +70,11 @@
   | o  5:7014ec2829cd added a
   |/    () draft
   | *    4:b9b387427a53 merge commit
-  | |\    () draft
+  | |\    () draft orphan
   +---o  3:9402371b436e added c and d
   | |     () draft
   | *  2:a1da0651488c added b
-  | |   () draft
+  | |   () draft orphan
   | x  1:1b24879c5c3c added a
   |/    () draft
   o  0:bde1d2b6b5e5 added base
@@ -91,11 +91,11 @@
   | o  5:7014ec2829cd added a
   |/    () draft
   | *    4:b9b387427a53 merge commit
-  | |\    () draft
+  | |\    () draft orphan
   +---x  3:9402371b436e added c and d
   | |     () draft
   | *  2:a1da0651488c added b
-  | |   () draft
+  | |   () draft orphan
   | x  1:1b24879c5c3c added a
   |/    () draft
   o  0:bde1d2b6b5e5 added base
@@ -212,11 +212,11 @@
   | o  5:0a6281e212fe added l
   |/    () draft
   | *    4:b9b387427a53 merge commit
-  | |\    () draft
+  | |\    () draft orphan
   +---o  3:9402371b436e added c and d
   | |     () draft
   | *  2:a1da0651488c added b
-  | |   () draft
+  | |   () draft orphan
   | x  1:1b24879c5c3c added a
   |/    () draft
   o  0:bde1d2b6b5e5 added base
@@ -235,11 +235,11 @@
   | o  5:0a6281e212fe added l
   |/    () draft
   | *    4:b9b387427a53 merge commit
-  | |\    () draft
+  | |\    () draft orphan
   +---x  3:9402371b436e added c and d
   | |     () draft
   | *  2:a1da0651488c added b
-  | |   () draft
+  | |   () draft orphan
   | x  1:1b24879c5c3c added a
   |/    () draft
   o  0:bde1d2b6b5e5 added base
@@ -358,11 +358,11 @@
   | o  5:0a6281e212fe added l
   |/    () draft
   | *    4:b9b387427a53 merge commit
-  | |\    () draft
+  | |\    () draft orphan
   +---o  3:9402371b436e added c and d
   | |     () draft
   | *  2:a1da0651488c added b
-  | |   () draft
+  | |   () draft orphan
   | x  1:1b24879c5c3c added a
   |/    () draft
   o  0:bde1d2b6b5e5 added base
@@ -381,11 +381,11 @@
   | o  5:0a6281e212fe added l
   |/    () draft
   | *    4:b9b387427a53 merge commit
-  | |\    () draft
+  | |\    () draft orphan
   +---x  3:9402371b436e added c and d
   | |     () draft
   | *  2:a1da0651488c added b
-  | |   () draft
+  | |   () draft orphan
   | x  1:1b24879c5c3c added a
   |/    () draft
   o  0:bde1d2b6b5e5 added base
--- a/tests/test-evolve-issue5881.t	Mon Sep 20 20:47:31 2021 +0300
+++ b/tests/test-evolve-issue5881.t	Tue Sep 21 22:11:31 2021 +0300
@@ -37,7 +37,7 @@
   o  3:e6048a693c0d updated b
   |   () draft
   | *  2:155349b645be added c
-  | |   () draft
+  | |   () draft orphan
   | @  1:5f6d8a4bf34a added b
   |/    () draft
   o  0:9092f1db7931 added a
--- a/tests/test-evolve-noupdate.t	Mon Sep 20 20:47:31 2021 +0300
+++ b/tests/test-evolve-noupdate.t	Tue Sep 21 22:11:31 2021 +0300
@@ -57,9 +57,9 @@
   @  5:7ed0642d644b added b
   |   () draft
   | *  4:c41c793e0ef1 added d
-  | |   () draft
+  | |   () draft orphan
   | *  3:ca1b80f7960a added c
-  | |   () draft
+  | |   () draft orphan
   | x  2:b1661037fa25 added b
   |/    () draft
   o  1:c7586e2a9264 added a
@@ -101,11 +101,11 @@
   o  8:3d41537b44ca added a
   |   () draft
   | *  7:b6b20b8eefdc added d
-  | |   () draft
+  | |   () draft orphan
   | *  6:7c46f743e62f added c
-  | |   () draft
+  | |   () draft orphan
   | @  5:7ed0642d644b added b
-  | |   () draft
+  | |   () draft orphan
   | x  1:c7586e2a9264 added a
   |/    () draft
   o  0:8fa14d15e168 added hgignore
--- a/tests/test-evolve-orphan-merge.t	Mon Sep 20 20:47:31 2021 +0300
+++ b/tests/test-evolve-orphan-merge.t	Tue Sep 21 22:11:31 2021 +0300
@@ -56,7 +56,7 @@
   @  4:64370c9805e7 added b
   |   () draft
   | *    3:3b2b6f4652ee merging a and b
-  | |\    () draft
+  | |\    () draft orphan
   +---x  2:d76850646258 added b
   | |     () draft
   | o  1:c7586e2a9264 added a
@@ -101,7 +101,7 @@
   @  6:3d41537b44ca added a
   |   () draft
   | *    5:91fd62122a4b merging a and b
-  | |\    () draft
+  | |\    () draft orphan
   +---o  4:64370c9805e7 added b
   | |     () draft
   | x  1:c7586e2a9264 added a
@@ -194,7 +194,7 @@
   @  11:31c317b7bdb1 foo to c
   |   () draft
   | *    10:fd41d25a3e90 foobar to c
-  | |\    () draft
+  | |\    () draft orphan
   +---o  9:d0f84b25d4e3 bar to c
   | |     () draft
   | x  8:1c165c673853 foo to c
@@ -250,7 +250,7 @@
   @  13:928097d0b5b5 foo to c
   |   () draft
   | *    12:c5405d2da7a1 foobar to c
-  | |\    () draft
+  | |\    () draft orphan
   +---x  11:31c317b7bdb1 foo to c
   | |     () draft
   | o  9:d0f84b25d4e3 bar to c
@@ -325,13 +325,13 @@
   @  20:fccc9de66799 added l
   |   () draft
   | *    19:190763373d8b merge commit
-  | |\    () draft
+  | |\    () draft orphan
   | | o  18:863d11043c67 added y
   | | |   () draft
   +---o  17:3f2247835c1d added x
   | |     () draft
   | *  16:e44dc179e7f5 added m
-  | |   () draft
+  | |   () draft orphan
   | x  15:8634bee7bf1e added l
   |/    () draft
   o  0:8fa14d15e168 added hgignore
@@ -392,7 +392,7 @@
   | o  24:3f371171d767 added l
   |/    () draft
   | *    23:7b78a9784f3e merged l and x
-  | |\    () draft
+  | |\    () draft orphan
   +---x  20:fccc9de66799 added l
   | |     () draft
   | x  17:3f2247835c1d added x
@@ -452,7 +452,7 @@
   1 new orphan changesets
   $ hg glog
   @    27:adb665a78e08 merged l and x
-  |\    () draft
+  |\    () draft orphan
   | x  25:cdf6547da25f added x
   | |   () draft
   o |  24:3f371171d767 added l
@@ -491,7 +491,7 @@
 
   $ hg glog
   @    28:fb8fe870ae7d merged l and x
-  |\    () draft
+  |\    () draft orphan
   | x  24:3f371171d767 added l
   |/    () draft
   o  0:8fa14d15e168 added hgignore
@@ -556,7 +556,7 @@
 
   $ hg glog
   @    30:32beb84b9dbc merge commit
-  |\    () draft
+  |\    () draft orphan
   | x  29:f3ba8b99bb6f added foo
   |     () draft
   o  0:8fa14d15e168 added hgignore
--- a/tests/test-evolve-orphan-split.t	Mon Sep 20 20:47:31 2021 +0300
+++ b/tests/test-evolve-orphan-split.t	Tue Sep 21 22:11:31 2021 +0300
@@ -71,7 +71,7 @@
   o  3:bd3735d4dab0 added a and b
   |   () draft
   | *  2:86e1ebf1ca61 added c
-  | |   () draft
+  | |   () draft orphan
   | x  1:d0ddb614efbd added a and b
   |/    () draft
   o  0:8fa14d15e168 added hgignore
@@ -170,7 +170,7 @@
   o  8:f2632392aefe added a b c
   |   () draft
   | *  7:d48a30875f01 added d
-  | |   () draft
+  | |   () draft orphan
   | x  6:f89e4764f2ed added a b c
   |/    () draft
   o  0:8fa14d15e168 added hgignore
@@ -184,7 +184,7 @@
   | o  8:f2632392aefe added a b c
   |/    () draft
   | *  7:d48a30875f01 added d
-  | |   () draft
+  | |   () draft orphan
   | x  6:f89e4764f2ed added a b c
   |/    () draft
   o  0:8fa14d15e168 added hgignore
--- a/tests/test-evolve-stop-orphan.t	Mon Sep 20 20:47:31 2021 +0300
+++ b/tests/test-evolve-stop-orphan.t	Tue Sep 21 22:11:31 2021 +0300
@@ -83,7 +83,7 @@
   @  5:cb6a2ab625bb added c
   |   () draft
   | *  4:c41c793e0ef1 added d
-  | |   () draft
+  | |   () draft orphan
   | x  3:ca1b80f7960a added c
   |/    () draft
   o  2:b1661037fa25 added b
@@ -128,7 +128,7 @@
   @  5:cb6a2ab625bb added c
   |   () draft
   | *  4:c41c793e0ef1 added d
-  | |   () draft
+  | |   () draft orphan
   | x  3:ca1b80f7960a added c
   |/    () draft
   o  2:b1661037fa25 added b
@@ -170,7 +170,7 @@
   @  5:cb6a2ab625bb added c
   |   () draft
   | *  4:c41c793e0ef1 added d
-  | |   () draft
+  | |   () draft orphan
   | x  3:ca1b80f7960a added c
   |/    () draft
   o  2:b1661037fa25 added b
@@ -244,13 +244,13 @@
   @  7:21817cd42526 added hgignore
       () draft
   *  6:2a4e03d422e2 added d
-  |   () draft
+  |   () draft orphan
   *  5:cb6a2ab625bb added c
-  |   () draft
+  |   () draft orphan
   *  2:b1661037fa25 added b
-  |   () draft
+  |   () draft orphan
   *  1:c7586e2a9264 added a
-  |   () draft
+  |   () draft orphan
   x  0:8fa14d15e168 added hgignore
       () draft
 
@@ -284,9 +284,9 @@
   @  7:21817cd42526 added hgignore
       () draft
   *  6:2a4e03d422e2 added d
-  |   () draft
+  |   () draft orphan
   *  5:cb6a2ab625bb added c
-  |   () draft
+  |   () draft orphan
   x  2:b1661037fa25 added b
   |   () draft
   x  1:c7586e2a9264 added a
@@ -362,11 +362,11 @@
   @  12:a3cc2042492f added a
   |   () draft
   | *  11:cd0909a30222 added d
-  | |   () draft
+  | |   () draft orphan
   | *  10:cb1dd1086ef6 added c
-  | |   (b1) draft
+  | |   (b1) draft orphan
   | *  9:aec285328e90 added b
-  | |   (b2) draft
+  | |   (b2) draft orphan
   | x  8:fd00db71edca added a
   |/    () draft
   o  7:21817cd42526 added hgignore
@@ -395,9 +395,9 @@
   @  12:a3cc2042492f added a
   |   () draft
   | *  11:cd0909a30222 added d
-  | |   () draft
+  | |   () draft orphan
   | *  10:cb1dd1086ef6 added c
-  | |   (b1) draft
+  | |   (b1) draft orphan
   | x  9:aec285328e90 added b
   | |   () draft
   | x  8:fd00db71edca added a
--- a/tests/test-evolve-stop-phasediv.t	Mon Sep 20 20:47:31 2021 +0300
+++ b/tests/test-evolve-stop-phasediv.t	Tue Sep 21 22:11:31 2021 +0300
@@ -75,7 +75,7 @@
 
   $ hg glog
   @  6:ddba58020bc0 added d
-  |   () draft
+  |   () draft phase-divergent
   | o  4:c41c793e0ef1 added d
   | |   () public
   | o  3:ca1b80f7960a added c
@@ -102,7 +102,7 @@
 
   $ hg glog
   @  6:ddba58020bc0 added d
-  |   () draft
+  |   () draft phase-divergent
   | o  4:c41c793e0ef1 added d
   | |   () public
   | o  3:ca1b80f7960a added c
--- a/tests/testlib/common.sh	Mon Sep 20 20:47:31 2021 +0300
+++ b/tests/testlib/common.sh	Tue Sep 21 22:11:31 2021 +0300
@@ -14,5 +14,5 @@
 
 cat >> $HGRCPATH << EOF
 [alias]
-glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
+glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase} {instabilities}"
 EOF