Mercurial > hgsubversion

changeset 807:800d293f907d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix imports from module alias The following code is incorrect: from os import path from path import abspath and fails with: ImportError: No module named path
author Patrick Mezard <pmezard@gmail.com>
date Mon, 16 May 2011 09:52:23 +0200
parents ec074ebaa80f
children b64173a27ce8
files hgsubversion/svnexternals.py hgsubversion/wrappers.py
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/svnexternals.py
+++ b/hgsubversion/svnexternals.py
@@ -15,7 +15,7 @@ except (ImportError, AttributeError), e:
 try:
     from mercurial.scmutil import canonpath
 except (ImportError, AttributeError):
-    from hgutil import canonpath
+    from mercurial.util import canonpath
 
 import util
 
--- a/hgsubversion/wrappers.py
+++ b/hgsubversion/wrappers.py
@@ -18,7 +18,7 @@ import util
 try:
     from mercurial.scmutil import revpair
 except ImportError:
-    from cmdutil import revpair
+    from mercurial.cmdutil import revpair
 
 pullfuns = {
     True: replay.convert_rev,