merge: forcefully mark files that we get from the second parent as dirty After a hg merge, we want to include in the commit all the files that we got from the second parent, so that we have the correct file-level history. To make them visible to hg commit, we try to mark them as dirty. Unfortunately, right now we can't really mark them as dirty[1] - the best we can do is to mark them as needing a full comparison of their contents, but they will still be considered clean if they happen to be identical to the version in the first parent. This changeset extends the dirstate format in a compatible way, so that we can mark a file as dirty: Right now we use a negative file size to indicate we don't have valid stat data for this entry. In practice, this size is always -1. This patch uses -2 to indicate that the entry is dirty. Older versions of hg won't choke on this dirstate, but they may happily mark the file as clean after a full comparison, destroying all of our hard work. The patch adds a dirstate.normallookup method with the semantics of the current normaldirty, and changes normaldirty to forcefully mark the entry as dirty. This should fix issue522. [1] - well, we could put them in state 'm', but that state has a different meaning.

     1

#!/bin/sh

     2

     3

cat >findbranch.py <<EOF

     4

import re, sys

     5

     6

head_re = re.compile('^#(?:(?:\\s+([A-Za-z][A-Za-z0-9_]*)(?:\\s.*)?)|(?:\\s*))$')

     7

     8

for line in sys.stdin:

     9

    hmatch = head_re.match(line)

    10

    if not hmatch:

    11

        sys.exit(1)

    12

    if hmatch.group(1) == 'Branch':

    13

        sys.exit(0)

    14

sys.exit(1)

    15

EOF

    16

hg init a

    17

cd a

    18

echo "Rev 1" >rev

    19

hg add rev

    20

hg commit -m "No branch."

    21

hg branch abranch

    22

echo "Rev  2" >rev

    23

hg commit -m "With branch."

    24

if hg export 0 | python ../findbranch.py; then

    25

    echo "Export of default branch revision has Branch header" 1>&2

    26

    exit 1

    27

fi

    28

if hg export 1 | python ../findbranch.py; then

    29

    :  # Do nothing

    30

else

    31

    echo "Export of branch revision is missing Branch header" 1>&2

    32

    exit 1

    33

fi

    34

# Make sure import still works with branch information in patches.

    35

cd ..

    36

hg init b

    37

cd b

    38

hg -R ../a export 0 | hg import -

    39

hg -R ../a export 1 | hg import -

    40

cd ..

    41

rm -rf b

    42

hg init b

    43

cd b

    44

hg -R ../a export 0 | hg import --exact -

    45

hg -R ../a export 1 | hg import --exact -