diff -r 82fe57213029 -r 61aea11fb83d mercurial/tags.py
--- a/mercurial/tags.py	Thu Apr 16 20:58:41 2015 -0500
+++ b/mercurial/tags.py	Fri Apr 17 23:22:58 2015 +0900
@@ -502,9 +502,9 @@
 
         try:
             lock = repo.wlock(wait=False)
-        except error.LockHeld:
+        except error.LockError:
             repo.ui.log('tagscache',
-                        'not writing .hg/%s because lock held\n' %
+                        'not writing .hg/%s because lock cannot be acquired\n' %
                         (_fnodescachefile))
             return