Mercurial > hgsubversion

changeset 1108:1a56b6d39abb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable.
author Augie Fackler <raf@durin42.com>
date Tue, 11 Feb 2014 12:49:25 -0500
parents 00193337d7f3 (current diff) 0f16e11b2c2b (diff)
children 48935ea2090f
files
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/layouts/standard.py
+++ b/hgsubversion/layouts/standard.py
@@ -57,7 +57,12 @@ class StandardLayout(base.BaseLayout):
 
     def taglocations(self, meta_data_dir):
         # import late to avoid trouble when running the test suite
-        from hgext_hgsubversion import util
+        try:
+            # newer versions of mercurial >= 2.8 will import this because the
+            # hgext_ logic is already being done in core
+            from hgsubversion import util
+        except ImportError:
+            from hgext_hgsubversion import util
 
         if self._tag_locations is None: