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

reverting foo

     2

changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e

     3

1 files updated, 0 files merged, 0 files removed, 0 files unresolved

     4

resolving manifests

     5

 overwrite None partial False

     6

 ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee

     7

 foo: remote is newer -> g

     8

getting foo

     9

1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    10

(branch merge, don't forget to commit)

    11

n   0         -2 unset             foo

    12

M foo

    13

c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo

    14

   rev    offset  length   base linkrev nodeid       p1           p2

    15

     0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000

    16

     1         5       9      1       1 6f4310b00b9a 2ed2a3912a0b 000000000000

    17

     2        14       5      2       2 c6fc755d7e68 6f4310b00b9a 000000000000