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

# 0-2-4

     4

#  \ \ \

     5

#   1-3-5

     6

#

     7

# rename in #1, content change in #4.

     8

     9

hg init t

    10

cd t

    11

    12

touch 1

    13

touch 2

    14

hg commit -Am init -d "0 0"  # 0

    15

    16

hg rename 1 1a

    17

hg commit -m rename -d "0 0" # 1

    18

    19

hg co -C 0

    20

echo unrelated >> 2

    21

hg ci -m unrelated1 -d "0 0"  # 2

    22

    23

hg merge --debug 1

    24

hg ci -m merge1 -d "0 0" # 3

    25

    26

hg co -C 2

    27

echo hello >> 1

    28

hg ci -m unrelated2 -d "0 0" # 4

    29

    30

hg co -C 3

    31

hg merge -y --debug 4

    32

    33

hg co -C 4

    34

hg merge -y --debug 3

    35