changeset 5145:c7aac40c85ff stable

test-compat: back out changeset 51e38bf936cf
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 28 Feb 2020 20:19:16 +0700
parents 7fa4bb23a78a
children 6704f99f881e
files tests/test-evolve-progress.t
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-progress.t	Fri Feb 28 20:18:42 2020 +0700
+++ b/tests/test-evolve-progress.t	Fri Feb 28 20:19:16 2020 +0700
@@ -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
@@ -152,6 +154,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