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

mkdir test

     4

cd test

     5

echo foo>foo

     6

hg init

     7

hg addremove

     8

hg commit -m 1

     9

hg verify

    10

hg serve -p 20059 -d --pid-file=hg.pid

    11

cat hg.pid >> $DAEMON_PIDS

    12

cd ..

    13

    14

http_proxy= hg clone --pull http://localhost:20059/ copy

    15

cd copy

    16

hg verify

    17

hg co

    18

cat foo

    19

hg manifest --debug

    20

hg pull

    21

    22

echo % issue 622

    23

cd ..

    24

hg init empty

    25

cd empty

    26

hg pull -u ../test