changeset 17968 | a9f4a6076740 |
parent 17895 | 17c030014ddf |
child 18031 | 54f063acc5ea |
--- a/mercurial/subrepo.py Tue Nov 27 13:09:05 2012 -0800 +++ b/mercurial/subrepo.py Tue Nov 27 14:58:00 2012 -0800 @@ -446,7 +446,7 @@ node2 = node.bin(node2) cmdutil.diffordiffstat(self._repo.ui, self._repo, diffopts, node1, node2, match, - prefix=os.path.join(prefix, self._path), + prefix=posixpath.join(prefix, self._path), listsubrepos=True, **opts) except error.RepoLookupError, inst: self._repo.ui.warn(_('warning: error "%s" in subrepository "%s"\n')