working out the bugs in hg to git translation