# HG changeset patch # User Anton Shestakov # Date 1580633470 -25200 # Node ID 51e38bf936cff4ebd0c36859169011d19059cff2 # Parent 1fe3f7ffb462396024dd57fe9f03aae784778255 tests: adjust test output for an early return in mergecopies() CORE-TEST-OUTPUT-UPDATE: baf3fe2977cc diff -r 1fe3f7ffb462 -r 51e38bf936cf tests/test-evolve-progress.t --- a/tests/test-evolve-progress.t Sat Feb 01 12:50:10 2020 +0100 +++ b/tests/test-evolve-progress.t Sun Feb 02 15:51:10 2020 +0700 @@ -42,8 +42,6 @@ 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 @@ -154,8 +152,6 @@ 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