Fixes to manifest.skip to handle hg