# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1615437620 -28800
# Node ID 73573aec18f79473ea835537b3f75e215dcb058f
# Parent  552efcc2cc30ce1d47f1609660ebd4549cce10cf# Parent  fd039a7f0c3cc0b4c07ee795e405ed70e1355b64
test-compat: merge mercurial-5.6 into mercurial-5.5

# no-check-commit

diff -r fd039a7f0c3c -r 73573aec18f7 tests/test-evolve-content-divergent-corner-cases.t
--- a/tests/test-evolve-content-divergent-corner-cases.t	Thu Mar 11 12:29:50 2021 +0800
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Thu Mar 11 12:40:20 2021 +0800
@@ -228,10 +228,10 @@
 
   $ cat >$TESTTMP/test_extension.py  << EOF
   > from mercurial import merge
-  > origupdate = merge._update
+  > origupdate = merge.update
   > def newupdate(*args, **kwargs):
   >   return origupdate(*args, **kwargs)
-  > merge._update = newupdate
+  > merge.update = newupdate
   > EOF
   $ cat >> $HGRCPATH << EOF
   > [extensions]
diff -r fd039a7f0c3c -r 73573aec18f7 tests/test-evolve-interrupted.t
--- a/tests/test-evolve-interrupted.t	Thu Mar 11 12:29:50 2021 +0800
+++ b/tests/test-evolve-interrupted.t	Thu Mar 11 12:40:20 2021 +0800
@@ -52,7 +52,7 @@
   $ hg l
   @  2 apricot and blueberry
   
-  *  1 banana
+  %  1 banana
   |
   x  0 apricot
   
@@ -80,7 +80,7 @@
   $ hg l
   @  2 apricot and blueberry
   
-  *  1 banana
+  %  1 banana
   |
   x  0 apricot
   
diff -r fd039a7f0c3c -r 73573aec18f7 tests/test-evolve-progress.t
--- a/tests/test-evolve-progress.t	Thu Mar 11 12:29:50 2021 +0800
+++ b/tests/test-evolve-progress.t	Thu Mar 11 12:40:20 2021 +0800
@@ -33,7 +33,7 @@
    ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58
    a: remote is newer -> g
   getting a
-  updating: a 1/1 files (100.00%)
+  updating: a 1/2 files (50.00%)
   committing files:
   a
   committing manifest
@@ -61,7 +61,7 @@
    ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab
    b: remote is newer -> g
   getting b
-  updating: b 1/1 files (100.00%)
+  updating: b 1/2 files (50.00%)
   committing files:
   b
   committing manifest
@@ -94,7 +94,7 @@
    ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0
    a: remote is newer -> g
   getting a
-  updating: a 1/1 files (100.00%)
+  updating: a 1/2 files (50.00%)
   committing files:
   a
   committing manifest
@@ -171,7 +171,7 @@
    ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062
    b: remote is newer -> g
   getting b
-  updating: b 1/1 files (100.00%)
+  updating: b 1/2 files (50.00%)
   committing files:
   b
   committing manifest
diff -r fd039a7f0c3c -r 73573aec18f7 tests/test-evolve-templates.t
--- a/tests/test-evolve-templates.t	Thu Mar 11 12:29:50 2021 +0800
+++ b/tests/test-evolve-templates.t	Thu Mar 11 12:40:20 2021 +0800
@@ -158,11 +158,11 @@
   
 
   $ hg log -GT '{successors|json}\n'
-  o  []
+  o  ""
   |
   | @  [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
   |/
-  o  []
+  o  ""
   
 
   $ hg up 'desc(A1)' --hidden