view tests/test-no-symlinks.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.

% unbundle
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
d/b
% move and copy
a
d/b
% bundle
2 changesets found
pulling from ../symlinks.hg
requesting all changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 6 changes to 6 files
(run 'hg update' to get a working copy)
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
a
d/b