view tests/test-rebuildstate.out @ 6297:fed1a9c22076

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.

adding bar
adding foo
% state dump
a   0         -1 baz
n 644          0 foo
r   0          0 bar
% status
A baz
R bar
C foo
% state dump
n 666         -1 bar
n 666         -1 foo
% status
! bar
? baz
C foo