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

% should display baz only

     2

? baz

     3

--

     4

A dir/b.o

     5

? a.c

     6

? a.o

     7

? dir/c.o

     8

? syntax

     9

--

    10

abort: .hgignore: invalid pattern (relre): *.o

    11

--

    12

A dir/b.o

    13

? .hgignore

    14

? a.c

    15

? syntax

    16

--

    17

A dir/b.o

    18

? .hgignore

    19

? a.c

    20

? syntax

    21

--

    22

A dir/b.o

    23

? .hgignore

    24

? a.c

    25

? syntax

    26

--

    27

A dir/b.o

    28

? .hgignore

    29

? a.c

    30

? syntax

    31

--

    32

.hgignore: ignoring invalid syntax 'invalid'

    33

A dir/b.o

    34

? .hgignore

    35

? a.c

    36

? a.o

    37

? dir/c.o

    38

? syntax

    39

--

    40

A dir/b.o

    41

? .hgignore

    42

? a.c

    43

? syntax

    44

--

    45

A dir/b.o

    46

? .hgignore

    47

? a.c

    48

? a.o

    49

? dir/c.o

    50

--

    51

A dir/b.o

    52

--

    53

A b.o