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

cat > abortcommit.py <<EOF

     4

from mercurial import util

     5

     6

def hook(**args):

     7

    raise util.Abort("no commits allowed")

     8

     9

def reposetup(ui, repo):

    10

    repo.ui.setconfig("hooks", "pretxncommit.nocommits", hook)

    11

EOF

    12

abspath=`pwd`/abortcommit.py

    13

    14

echo "[extensions]" >> $HGRCPATH

    15

echo "mq=" >> $HGRCPATH

    16

echo "abortcommit = $abspath" >> $HGRCPATH

    17

    18

hg init foo

    19

cd foo

    20

echo foo > foo

    21

hg add foo

    22

    23

# mq may keep a reference to the repository so __del__ will not be called

    24

# and .hg/journal.dirstate will not be deleted:

    25

hg ci -m foo

    26

hg ci -m foo

    27

    28

exit 0