view tests/test-mq-qrefresh-replace-log-message.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.

=======================
Should fail if no patches applied
No patches applied
No patches applied
=======================
Should display 'First commit message'
description:
First commit message



=======================
Should display 'Second commit message'
description:
Second commit message



=======================
Should display 'Third commit message\n This is the 3rd log message'
description:
Third commit message
 This is the 3rd log message



=======================
Should display 'Fifth commit message\n This is the 5th log message'
description:
Fifth commit message