dirstate-v2: actually fix the dirstate-v2 upgrade race

Merge request reports