Mercurial > public > mercurial-scm > hg
diff tests/test-merge-local.t @ 30229:69ffbbe73dd0 stable
merge: avoid superfluous filemerges when grafting through renames (issue5407)
This is a fix for a regression introduced by the patches for issue4028.
The test changes are due to us doing fewer _checkcopies searches now, which
makes some test outputs revert to the pre-issue4028 behavior. That issue itself
remains fixed, we only skip copy tracing for files where it isn't relevant.
As a nice side effect, this makes copy detection much faster when tracing
backwards through lots of renames.
| author | G?bor Stefanik <gabor.stefanik@nng.com> |
|---|---|
| date | Tue, 25 Oct 2016 21:01:53 +0200 |
| parents | a2804ddcf9ae |
| children | 9e4f82bc2b0b |
line wrap: on
line diff
--- a/tests/test-merge-local.t Wed Oct 19 18:06:14 2016 +0200 +++ b/tests/test-merge-local.t Tue Oct 25 21:01:53 2016 +0200 @@ -66,7 +66,7 @@ merging zzz1_merge_ok merging zzz2_merge_bad warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark') - 2 files updated, 1 files merged, 2 files removed, 1 files unresolved + 2 files updated, 1 files merged, 3 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [1] @@ -104,7 +104,7 @@ merging zzz1_merge_ok merging zzz2_merge_bad warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark') - 2 files updated, 1 files merged, 2 files removed, 1 files unresolved + 2 files updated, 1 files merged, 3 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [1]