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

syntax: glob

     2

     3

*.elc

     4

*.orig

     5

*.rej

     6

*~

     7

*.o

     8

*.so

     9

*.pyc

    10

*.swp

    11

*.prof

    12

tests/.coverage*

    13

tests/annotated

    14

tests/*.err

    15

build

    16

contrib/hgsh/hgsh

    17

dist

    18

doc/*.[0-9]

    19

doc/*.[0-9].gendoc.txt

    20

doc/*.[0-9].{x,ht}ml

    21

MANIFEST

    22

patches

    23

mercurial/__version__.py

    24

.DS_Store

    25

    26

syntax: regexp

    27

^\.pc/

    28

Output/Mercurial-[0-9.]*.exe