We are tracking changes in a remote mercurial repository in a git repository. The situation is very complex – in mercurial, subdirectories are their own separate repo, but we have merged them all together for git.