diff -r b616f328af9f -r dbf20df40eb1 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Wed Apr 22 02:01:22 2009 +0200
+++ b/mercurial/localrepo.py	Wed Apr 22 02:01:22 2009 +0200
@@ -1068,6 +1068,8 @@
                     wlock = None
                     try:
                         try:
+                            # updating the dirstate is optional
+                            # so we dont wait on the lock
                             wlock = self.wlock(False)
                             for f in fixup:
                                 self.dirstate.normal(f)