diff -r a337f4b9b99d -r 71570f310417 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Mon Oct 13 16:43:37 2014 -0700
+++ b/mercurial/localrepo.py	Mon Oct 13 14:34:53 2014 -0700
@@ -1377,7 +1377,7 @@
         Revision information is passed via the context argument.
         """
 
-        tr = lock = None
+        tr = None
         p1, p2 = ctx.p1(), ctx.p2()
         user = ctx.user()