diff tests/test-evolve-content-divergent-stack.t @ 5830:67fc03f42d92 mercurial-5.0

test-compat: merge mercurial-5.1 into mercurial-5.0

# no-check-commit

--- a/tests/test-evolve-content-divergent-stack.t	Sun Jan 31 15:39:25 2021 +0800
+++ b/tests/test-evolve-content-divergent-stack.t	Thu Mar 11 14:22:45 2021 +0800
@@ -749,7 +749,7 @@
   $ hg evolve --stop
   2 new orphan changesets
   stopped the interrupted evolve
-  working directory is now at 2a955e808c53
+  working directory is now at 509103439e5e
   $ hg log -G
   o  changeset:   21:7e67dfb7ee31
   |  tag:         tip
@@ -770,7 +770,7 @@
   | |  instability: orphan, content-divergent
   | |  summary:     added c
   | |
-  | *  changeset:   17:509103439e5e
+  | @  changeset:   17:509103439e5e
   | |  parent:      5:8e222f257bbf
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -789,7 +789,7 @@
   | | |  instability: orphan, content-divergent
   | | |  summary:     added c
   | | |
-  | | @  changeset:   14:2a955e808c53
+  | | *  changeset:   14:2a955e808c53
   | | |  parent:      10:c04ff147ef79
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -837,10 +837,10 @@
   x  c7586e2a9264 (1) added a
   
   $ hg obslog -r 'desc("added b")' --all
-  @  2a955e808c53 (14) added b
+  *  2a955e808c53 (14) added b
   |    amended(content) from 6eb54b5af3fb using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
-  | *  509103439e5e (17) added b
+  | @  509103439e5e (17) added b
   | |    amended(content) from d5f148423c16 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  6eb54b5af3fb (11) added b