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

set -e

     4

     5

echo "[extensions]" >> $HGRCPATH

     6

echo "hbisect=" >> $HGRCPATH

     7

     8

echo % init

     9

hg init

    10

    11

echo % committing changes

    12

count=0

    13

echo > a

    14

while test $count -lt 32 ; do

    15

    echo 'a' >> a

    16

    test $count -eq 0 && hg add

    17

    hg ci -m "msg $count" -d "$count 0"

    18

    echo % committed changeset $count

    19

    count=`expr $count + 1`

    20

done

    21

    22

echo % log

    23

hg log

    24

    25

echo % hg up -C

    26

hg up -C

    27

    28

echo % bisect test

    29

hg bisect init

    30

hg bisect bad

    31

hg bisect good 1

    32

hg bisect good

    33

hg bisect good

    34

hg bisect good

    35

hg bisect bad

    36

hg bisect good