As there was no activity, I went ahead and emailed a patch today, using
Simon's first suggestion ("let's recompute the dirstate data").

We can perhaps do better than a simple dirstate recomputation (?), but for
now, it does not make sense to leave this bug live, as we have a working
solution.