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

# In the merge below, the file "foo" has the same contents in both

     4

# parents, but if we look at the file-level history, we'll notice that

     5

# the version in p1 is an ancestor of the version in p2.  This test

     6

# makes sure that we'll use the version from p2 in the manifest of the

     7

# merge revision.

     8

     9

hg init repo

    10

cd repo

    11

    12

echo foo > foo

    13

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

    14

    15

echo bar >> foo

    16

hg ci -d '0 0' -m 'change foo'

    17

    18

hg backout -d '0 0' -r tip -m 'backout changed foo'

    19

    20

hg up -C 0

    21

touch bar

    22

hg ci -d '0 0' -qAm 'add bar'

    23

    24

hg merge --debug

    25

hg debugstate | grep foo

    26

hg st -A foo

    27

hg ci -d '0 0' -m 'merge'

    28

    29

hg manifest --debug | grep foo

    30

hg debugindex .hg/store/data/foo.i

    31