Mercurial > evolve

changeset 5634:afcd4e44816f mercurial-5.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: adjust test output after b2de5825e5ca for older Mercurial Older versions don't have `%` graph nodes, they only have `*`.
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 31 Oct 2020 18:55:21 +0800
parents 4ab2f602beb3
children a34b5cf906c6 6ce036cb7fd4
files tests/test-evolve-abort-orphan.t tests/test-evolve-phase.t tests/test-evolve.t tests/test-stabilize-conflict.t
diffstat 4 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-abort-orphan.t	Sat Oct 31 18:48:57 2020 +0800
+++ b/tests/test-evolve-abort-orphan.t	Sat Oct 31 18:55:21 2020 +0800
@@ -203,7 +203,7 @@
   |   () draft
   | *  6:e83de241f751 added d
   | |   () draft
-  | %  5:e93a9161a274 added c
+  | *  5:e93a9161a274 added c
   | |   () draft
   | x  2:b1661037fa25 added b
   | |   () draft
@@ -297,7 +297,7 @@
   |/    () draft
   @  7:807e8e2ca559 added a
   |   () draft
-  | %  6:8f20d4390c21 foo to a
+  | *  6:8f20d4390c21 foo to a
   | |   () draft
   | | *  5:bcb1c47f8520 added d
   | | |   () draft
@@ -361,7 +361,7 @@
   |/    () draft
   @  7:807e8e2ca559 added a
   |   () draft
-  | %  6:8f20d4390c21 foo to a
+  | *  6:8f20d4390c21 foo to a
   | |   () draft
   | | *  5:bcb1c47f8520 added d
   | | |   () draft
@@ -446,7 +446,7 @@
   |/    () draft
   @  7:807e8e2ca559 added a
   |   () draft
-  | %  6:8f20d4390c21 foo to a
+  | *  6:8f20d4390c21 foo to a
   | |   () draft
   | x  1:2f913b0c9220 added a
   |/    () draft
@@ -514,7 +514,7 @@
   |   (bm1) draft
   o  4:a0086c17bfc7 added a
   |   () draft
-  | %  3:17509928e5bf added c
+  | *  3:17509928e5bf added c
   | |   () draft
   | x  2:9f0c80a55ddc added b
   | |   () draft
--- a/tests/test-evolve-phase.t	Sat Oct 31 18:48:57 2020 +0800
+++ b/tests/test-evolve-phase.t	Sat Oct 31 18:55:21 2020 +0800
@@ -103,7 +103,7 @@
   $ hg glog
   @  3 - 87495ea7c9ec b (draft)
   |
-  | %  2 - 13833940840c c (secret)
+  | *  2 - 13833940840c c (secret)
   | |
   | x  1 - 1e6c11564562 b (draft)
   |/
--- a/tests/test-evolve.t	Sat Oct 31 18:48:57 2020 +0800
+++ b/tests/test-evolve.t	Sat Oct 31 18:55:21 2020 +0800
@@ -1401,7 +1401,7 @@
   |
   o  32:6ec468e4cb98@default(draft) amended
   |
-  | %  31:5be050657ca5@default(draft) will cause conflict at evolve
+  | *  31:5be050657ca5@default(draft) will cause conflict at evolve
   | |
   | x  30:748126f98ff1@default(draft) will be evolved safely
   | |
--- a/tests/test-stabilize-conflict.t	Sat Oct 31 18:48:57 2020 +0800
+++ b/tests/test-stabilize-conflict.t	Sat Oct 31 18:55:21 2020 +0800
@@ -141,7 +141,7 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to ten
   |
-  | %  changeset:   4:71c18f70c34f
+  | *  changeset:   4:71c18f70c34f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
@@ -234,7 +234,7 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to ten
   |
-  | %  changeset:   6:1836b91c6c1d
+  | *  changeset:   6:1836b91c6c1d
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan