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 "mq=" >> $HGRCPATH

     5

     6

hg init a

     7

cd a

     8

echo a > a

     9

hg ci -Ama

    10

    11

hg qnew a.patch

    12

echo a >> a

    13

hg qrefresh

    14

    15

hg qnew b.patch

    16

echo b > b

    17

hg add b

    18

hg qrefresh

    19

    20

hg qnew c.patch

    21

echo c > c

    22

hg add c

    23

hg qrefresh

    24

    25

hg qgoto a.patch

    26

hg qgoto c.patch

    27

hg qgoto b.patch