bug 929335 - vcs-sync: recover from more hg corruption. r=hwine