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

     9

echo 'base' > base

    10

hg ci -Ambase -d '1 0'

    11

    12

hg qnew -mmqbase mqbase

    13

hg qrename mqbase renamed

    14

mkdir .hg/patches/foo

    15

hg qrename renamed foo

    16

hg qseries

    17

ls .hg/patches/foo

    18

mkdir .hg/patches/bar

    19

hg qrename foo/renamed bar

    20

hg qseries

    21

ls .hg/patches/bar

    22

hg qrename bar/renamed baz

    23

hg qseries

    24

ls .hg/patches/baz

    25