While writing a test for this, I noticed that that patch is not enough, since
it doesn't update the dirstate, and this is turning out to be quite a bit
more tricky than I expected.