--- hgsvn/common.py.orig 2015-10-10 13:27:52.000000000 +0200
+++ hgsvn/common.py 2015-10-13 20:37:23.006193436 +0200
@@ -49,18 +49,17 @@
# We import the lock logic from Mercurial if it is available, and fall back
# to a dummy (always successful) lock if not.
-try:
- from mercurial.lock import lock as _lock
- try:
- from mercurial.error import LockHeld
- except ImportError:
- # LockHeld was defined in mercurial.lock in Mercurial < 1.2
- from mercurial.lock import LockHeld
-
-except ImportError:
- _lock = _SimpleFileLock
- LockHeld = _LockHeld
-
+#try:
+# from mercurial.lock import lock as _lock
+# try:
+# from mercurial.error import LockHeld
+# except ImportError:
+# # LockHeld was defined in mercurial.lock in Mercurial < 1.2
+# from mercurial.lock import LockHeld
+#
+#except (ImportError, TypeError):
+_lock = _SimpleFileLock
+LockHeld = _LockHeld
hgsvn_private_dir = ".hgsvn"
hgsvn_lock_file = "lock"