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

#!/bin/sh

     2

     3

echo "[extensions]" >> $HGRCPATH

     4

echo "extdiff=" >> $HGRCPATH

     5

     6

hg init a

     7

cd a

     8

echo a > a

     9

hg add

    10

hg extdiff -o -r $opt

    11

    12

echo "[extdiff]" >> $HGRCPATH

    13

echo "cmd.falabala=echo" >> $HGRCPATH

    14

echo "opts.falabala=diffing" >> $HGRCPATH

    15

    16

hg falabala

    17

    18

hg help falabala

    19

    20

hg ci -d '0 0' -mtest1

    21

    22

echo b >> a

    23

hg ci -d '1 0' -mtest2

    24

    25

hg falabala -r 0:1

    26

    27

# test diff during merge

    28

hg update 0

    29

echo b >> b

    30

hg add b

    31

hg ci -m "new branch" -d '1 0'

    32

hg update -C 1

    33

hg merge tip

    34

hg falabala || echo "diff-like tools yield a non-zero exit code"