# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1305532343 -7200
# Node ID 800d293f907d7fddced5cef1b449c7bcd713ff4d
# Parent  ec074ebaa80f918813926652f2e0d0ea788cfb33
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

diff --git a/hgsubversion/svnexternals.py b/hgsubversion/svnexternals.py
--- 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
 
diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py
--- 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,