Mercurial > hg
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.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 18 Mar 2008 04:07:39 -0300 |
parents | 448eb46d4d84 |
children | fb32ae9c76e7 |
line wrap: on
line source
======================= 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