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

unset HGUSER

     4

EMAIL="My Name <myname@example.com>"

     5

export EMAIL

     6

     7

hg init test

     8

cd test

     9

touch asdf

    10

hg add asdf

    11

hg commit -d '1000000 0' -m commit-1

    12

hg tip

    13

    14

unset EMAIL

    15

echo 1234 > asdf

    16

hg commit -d '1000000 0' -u "foo@bar.com" -m commit-1

    17

hg tip

    18

echo "[ui]" >> .hg/hgrc

    19

echo "username = foobar <foo@bar.com>" >> .hg/hgrc

    20

echo 12 > asdf

    21

hg commit -d '1000000 0' -m commit-1

    22

hg tip

    23

echo 1 > asdf

    24

hg commit -d '1000000 0' -u "foo@bar.com" -m commit-1

    25

hg tip

    26

echo 123 > asdf

    27

echo "[ui]" > .hg/hgrc

    28

echo "username = " >> .hg/hgrc

    29

hg commit -d '1000000 0' -m commit-1

    30

rm .hg/hgrc

    31

hg commit -d '1000000 0' -m commit-1 2>&1 | sed -e "s/'[^']*'/user@host/"