diff tests/test-evolve-progress.t @ 6184:b8a1743e7ff9 mercurial-5.3

test-compat: merge mercurial-5.4 into mercurial-5.3

--- a/tests/test-evolve-progress.t	Tue Feb 22 08:43:16 2022 +0300
+++ b/tests/test-evolve-progress.t	Tue Feb 22 08:57:39 2022 +0300
@@ -33,7 +33,7 @@
    ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58
    a: remote is newer -> g
   getting a
-  updating: a 1/2 files (50.00%)
+  updating: a 1/1 files (100.00%)
   committing files:
   a
   committing manifest
@@ -42,6 +42,8 @@
   move:[2] third
   hg rebase -r 769574b07a96 -d 5f16d91ecde0
   evolve: 2/3 changesets (66.67%)
+    unmatched files in other:
+     b
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 4f60c78b6d58, local: 5f16d91ecde0+, remote: 769574b07a96
@@ -61,7 +63,7 @@
    ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab
    b: remote is newer -> g
   getting b
-  updating: b 1/2 files (50.00%)
+  updating: b 1/1 files (100.00%)
   committing files:
   b
   committing manifest
@@ -94,7 +96,7 @@
    ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0
    a: remote is newer -> g
   getting a
-  updating: a 1/2 files (50.00%)
+  updating: a 1/1 files (100.00%)
   committing files:
   a
   committing manifest
@@ -153,6 +155,8 @@
   atop:[11] second
   hg rebase -r 53c0008d98a0 -d 60a86497fbfe
   evolve: 2/3 changesets (66.67%)
+    unmatched files in other:
+     b
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0
@@ -171,7 +175,7 @@
    ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062
    b: remote is newer -> g
   getting b
-  updating: b 1/2 files (50.00%)
+  updating: b 1/1 files (100.00%)
   committing files:
   b
   committing manifest