Mercurial subrepos done right