merge: fix a copy detection bug (issue672) When merging rev1 and rev2, we want to search for copies that happened in rev1 but not in rev2 and vice-versa. We were starting the search at rev1/rev2 and then going back, stopping as soon as we reached the revno of the ancestor, but that can miss some cases (see the new test-issue672). Now we calculate the revisions that are ancestors of rev1 or rev2 (but not both) and make sure the search doesn't stop too early. Simplified test provided by mpm, based on a test case provided by Edward Lee.

     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"