I am creating this issue to supersede issue1810 and issue1719.

Those two issues arise in different contexts, but the source of the problem
is the very same: accessing dirstate when it's dirty, and simon's is already
working on a patch.

I'm adding a patch containing merged tests and their corresponding outputs.