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

# Test that qpush cleans things up if it doesn't complete

     4

     5

echo "[extensions]" >> $HGRCPATH

     6

echo "mq=" >> $HGRCPATH

     7

     8

hg init repo

     9

cd repo

    10

    11

echo foo > foo

    12

hg ci -Am 'add foo' -d '0 0'

    13

    14

touch untracked-file

    15

echo 'syntax: glob' > .hgignore

    16

echo '.hgignore' >> .hgignore

    17

    18

hg qinit

    19

hg qnew patch1

    20

echo >> foo

    21

hg qrefresh -m 'patch 1'

    22

    23

hg qnew patch2

    24

echo bar > bar

    25

hg add bar

    26

hg qrefresh -m 'patch 2'

    27

    28

hg qnew bad-patch

    29

echo >> foo

    30

hg qrefresh

    31

    32

hg qpop -a

    33

    34

python -c 'print "\xe9"' > message

    35

cat .hg/patches/bad-patch >> message

    36

mv message .hg/patches/bad-patch

    37

    38

hg qpush -a && echo 'qpush succeded?!'

    39

    40

hg parents

    41

    42

echo '% bar should be gone; other unknown/ignored files should still be around'

    43

hg status -A