dirstate.remove: during merges, remember the previous file state We encode the previous state as a negative file size (AFAICS, previous versions of hg always have size == 0 when state == 'r'). We save the state of 'm'erged and dirty files, because they're the two states that indicate that a file has to be committed on a merge to correctly record per-file history.

     1

merging foo1 and foo

     2

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

     3

(branch merge, don't forget to commit)

     4

n   0         -2 bar

     5

m 644         14 foo1

     6

copy: foo -> foo1

     7

M bar

     8

M foo1

     9

% removing foo1 and bar

    10

r   0         -2 bar

    11

r   0         -1 foo1

    12

copy: foo -> foo1

    13

R bar

    14

R foo1

    15

  foo