tests/test-evolve-obshistory-complex.t
branchmercurial-4.4
changeset 3590 d5adce52cef4
parent 3567 5ddea3b8d2a4
child 3591 98941c28f3e2
child 4363 a2fdbece7ce1
--- a/tests/test-evolve-obshistory-complex.t	Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-evolve-obshistory-complex.t	Wed Mar 21 16:06:17 2018 +0100
@@ -67,8 +67,8 @@
 ------------------------
 
   $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0"
+  2 changesets folded
   4 new orphan changesets
-  2 changesets folded
   $ hg fold --exact -r 3 -r 4 --date "0 0" -m "fold1"
   2 changesets folded
   $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" -n "folding changesets to test"
@@ -94,7 +94,7 @@
   |  instability: orphan
   |  summary:     fold2
   |
-  | *  changeset:   8:d15d0ffc75f6
+  | o  changeset:   8:d15d0ffc75f6
   | |  parent:      2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -208,7 +208,6 @@
   record this change to 'D'? [Ynesfdaq?] Y
   
   no more change to split
-  1 new orphan changesets
   $ hg split "desc(fold2)" -d "0 0" << EOF
   > Y
   > Y
@@ -243,7 +242,6 @@
   record this change to 'F'? [Ynesfdaq?] Y
   
   no more change to split
-  1 new orphan changesets
   $ hg log -G
   @  changeset:   15:d4a000f63ee9
   |  tag:         tip
@@ -252,20 +250,20 @@
   |  instability: orphan
   |  summary:     fold2
   |
-  *  changeset:   14:ec31316faa9d
+  o  changeset:   14:ec31316faa9d
   |  parent:      4:868d2e0eb19c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  instability: orphan
   |  summary:     fold2
   |
-  | *  changeset:   13:d0f33db50670
+  | o  changeset:   13:d0f33db50670
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan
   | |  summary:     fold1
   | |
-  | *  changeset:   12:7b3290f6e0a0
+  | o  changeset:   12:7b3290f6e0a0
   | |  parent:      2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -328,14 +326,14 @@
   |  instability: orphan
   |  summary:     fold2
   |
-  *  changeset:   14:ec31316faa9d
+  o  changeset:   14:ec31316faa9d
   |  parent:      4:868d2e0eb19c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  instability: orphan
   |  summary:     fold2
   |
-  | *  changeset:   12:7b3290f6e0a0
+  | o  changeset:   12:7b3290f6e0a0
   | |  parent:      2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -384,7 +382,7 @@
 walking algorithm works no matter the level of successors + precursors
 
   $ hg obslog 12
-  *    7b3290f6e0a0 (12) fold1
+  o    7b3290f6e0a0 (12) fold1
   |\
   x |    d15d0ffc75f6 (8) fold1
   |\ \     rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -412,11 +410,11 @@
   $ hg obslog --all 15
   o  19e14c8397fc (10) fold0
   |
-  | *    7b3290f6e0a0 (12) fold1
+  | o    7b3290f6e0a0 (12) fold1
   | |\
   | | | @  d4a000f63ee9 (15) fold2
   | | | |
-  | | | | *  ec31316faa9d (14) fold2
+  | | | | o  ec31316faa9d (14) fold2
   | | | |/|
   | | | x |    100cc25b765f (9) fold2
   | | | |\ \     rewritten(parent, content) as d4a000f63ee9, ec31316faa9d using split by test (Thu Jan 01 00:00:00 1970 +0000)