Mercurial > evolve

changeset 5112:51e38bf936cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: adjust test output for an early return in mergecopies() CORE-TEST-OUTPUT-UPDATE: baf3fe2977cc
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 02 Feb 2020 15:51:10 +0700
parents 1fe3f7ffb462
children a66c9fc9c503
files tests/test-evolve-progress.t
diffstat 1 files changed, 0 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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