merge: do early copy to deal with issue636 Without copies/renames, merges source names are 1:1 with their targets. Copies and renames introduce the possibility that there will be two merges with the same input but different output. By doing the copy to the destination name before the merge, the actual merge becomes 1:1 again, and no source is the input to two different merges. - add a preliminary scan to applyupdates to do copies - for the merge action, pass the old name (for finding ancestors) and the new name (for input to the merge) to filemerge - eliminate the old post-merge copy - lookup file contents from new name in filemerge - pass new name to external merge helper - report merge failure at new name - add a test

     1

% init

     2

% commit

     3

adding base

     4

% qnew mqbase

     5

% qrefresh

     6

% qdiff

     7

diff -r 67e992f2c4f3 base

     8

--- a/base

     9

+++ b/base

    10

@@ -1,1 +1,1 @@ base

    11

-base

    12

+patched

    13

% qdiff dirname

    14

diff -r 67e992f2c4f3 base

    15

--- a/base

    16

+++ b/base

    17

@@ -1,1 +1,1 @@ base

    18

-base

    19

+patched