view debian/test-blacklist @ 1592:f157ef7b1741

evolve: extract logic to new method _evolvemerge

This patch introduces a new method _evolvemerge to merge orig to dest in
relocate method.

This simplifies the code of the method relocate and allows us to re-use it
later in the scope of the rework of 'hg evolve --continue'

test-drop.t
test-inhibit.t
test-simple4server.t
tests/test-simple4server-bundle2.t