# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1392140965 18000
# Node ID 1a56b6d39abb683dbd8936fcac7fc1f01bce26ae
# Parent  00193337d7f33de4ea1525db4e29147986095b06# Parent  0f16e11b2c2bccb2f92d5f9a741d031eac344769
Merge with stable.

diff --git a/hgsubversion/layouts/standard.py b/hgsubversion/layouts/standard.py
--- 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: