Mercurial > hg
diff tests/test-graft.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 | 1894c830ee74 |
children | ce3a133f71b3 |
line wrap: on
line diff
--- a/tests/test-graft.t Wed Oct 19 18:06:14 2016 +0200 +++ b/tests/test-graft.t Tue Oct 25 21:01:53 2016 +0200 @@ -181,9 +181,6 @@ searching for copies back to rev 1 unmatched files in other (from topological common ancestor): c - all copies found (* = to merge, ! = divergent, % = renamed and deleted): - src: 'c' -> dst: 'b' * - checking for directory renames resolving manifests branchmerge: True, force: True, partial: False ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 @@ -200,9 +197,6 @@ searching for copies back to rev 1 unmatched files in other (from topological common ancestor): c - all copies found (* = to merge, ! = divergent, % = renamed and deleted): - src: 'c' -> dst: 'b' * - checking for directory renames resolving manifests branchmerge: True, force: True, partial: False ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d @@ -1280,3 +1274,15 @@ $ hg cat f2c c2e + +Check superfluous filemerge of files renamed in the past but untouched by graft + + $ echo a > a + $ hg ci -qAma + $ hg mv a b + $ echo b > b + $ hg ci -qAmb + $ echo c > c + $ hg ci -qAmc + $ hg up -q .~2 + $ hg graft tip -qt:fail