revert: update state of files in the "checkout" list This can make a difference when there are filters involved and decode(encode(working-dir-data)) != working-dir-data even though encode(decode(repo-data)) == repo-data An example is a working dir file that uses only \n when you're using the win32text extension.

normallookup: during merges, restore the state saved by remove

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.

debugstate: add --nodates This can be useful for tests.

patch: fix corner case with update + copy patch handling (issue 937) The self patching of files when diffed with a backup is a bit peculiar to me. It makes sense in mpatch, that's less clear in mercurial patching code. Let's document and preserve it for now.

Merge