diff tests/test-evolve-stop-orphan.t @ 3930:d00f0c369bc7 mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 02 Aug 2018 02:47:44 +0200
parents 5ca297e78f2c 629558d09898
children 537fd9a86c06 684cc3418ecd
line wrap: on
line diff
--- a/tests/test-evolve-stop-orphan.t	Thu Aug 02 02:42:15 2018 +0200
+++ b/tests/test-evolve-stop-orphan.t	Thu Aug 02 02:47:44 2018 +0200
@@ -74,7 +74,7 @@
   $ hg glog
   @  5:cb6a2ab625bb added c
   |   () draft
-  | *  4:c41c793e0ef1 added d
+  | o  4:c41c793e0ef1 added d
   | |   () draft
   | x  3:ca1b80f7960a added c
   |/    () draft
@@ -117,7 +117,7 @@
   $ hg glog
   @  5:cb6a2ab625bb added c
   |   () draft
-  | *  4:c41c793e0ef1 added d
+  | o  4:c41c793e0ef1 added d
   | |   () draft
   | x  3:ca1b80f7960a added c
   |/    () draft
@@ -157,7 +157,7 @@
   $ hg glog
   @  5:cb6a2ab625bb added c
   |   () draft
-  | *  4:c41c793e0ef1 added d
+  | o  4:c41c793e0ef1 added d
   | |   () draft
   | x  3:ca1b80f7960a added c
   |/    () draft
@@ -214,13 +214,13 @@
   $ hg glog
   @  7:21817cd42526 added hgignore
       () draft
-  *  6:2a4e03d422e2 added d
+  o  6:2a4e03d422e2 added d
   |   () draft
-  *  5:cb6a2ab625bb added c
+  o  5:cb6a2ab625bb added c
   |   () draft
-  *  2:b1661037fa25 added b
+  o  2:b1661037fa25 added b
   |   () draft
-  *  1:c7586e2a9264 added a
+  o  1:c7586e2a9264 added a
   |   () draft
   x  0:8fa14d15e168 added hgignore
       () draft
@@ -253,9 +253,9 @@
   |   () draft
   o  7:21817cd42526 added hgignore
       () draft
-  *  6:2a4e03d422e2 added d
+  o  6:2a4e03d422e2 added d
   |   () draft
-  *  5:cb6a2ab625bb added c
+  o  5:cb6a2ab625bb added c
   |   () draft
   x  2:b1661037fa25 added b
   |   () draft
@@ -329,11 +329,11 @@
   $ hg glog
   @  12:a3cc2042492f added a
   |   () draft
-  | *  11:cd0909a30222 added d
+  | o  11:cd0909a30222 added d
   | |   () draft
-  | *  10:cb1dd1086ef6 added c
+  | o  10:cb1dd1086ef6 added c
   | |   (b1) draft
-  | *  9:aec285328e90 added b
+  | o  9:aec285328e90 added b
   | |   (b2) draft
   | x  8:fd00db71edca added a
   |/    () draft
@@ -360,9 +360,9 @@
   |   (b2) draft
   o  12:a3cc2042492f added a
   |   () draft
-  | *  11:cd0909a30222 added d
+  | o  11:cd0909a30222 added d
   | |   () draft
-  | *  10:cb1dd1086ef6 added c
+  | o  10:cb1dd1086ef6 added c
   | |   (b1) draft
   | x  9:aec285328e90 added b
   | |   () draft