--- a/mercurial/lock.py	Sat Nov 14 14:21:53 2009 +0100
+++ b/mercurial/lock.py	Mon Nov 16 11:55:29 2009 +0100
@@ -112,8 +112,7 @@
         # if locker dead, break lock.  must do this with another lock
         # held, or can race and break valid lock.
         try:
-            l = lock(self.f + '.break')
-            l.trylock()
+            l = lock(self.f + '.break', timeout=0)
             os.unlink(self.f)
             l.release()
         except error.LockError: