view tests/test-journal-exists.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 a
abort: journal already exists - run hg recover!
rolling back interrupted transaction
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions