# HG changeset patch # User Anton Shestakov # Date 1588938288 -28800 # Node ID 457c4c6646d6234894b8313c0fd3cda454022f0a # Parent 01bcd39c432c48c95761b504a1312a16e432b382 test-compat: back out changeset 51e38bf936cf diff -r 01bcd39c432c -r 457c4c6646d6 tests/test-evolve-progress.t --- a/tests/test-evolve-progress.t Fri May 08 19:22:36 2020 +0800 +++ b/tests/test-evolve-progress.t Fri May 08 19:44:48 2020 +0800 @@ -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