--- a/mercurial/merge.py	Tue Aug 08 09:11:16 2006 -0500
+++ b/mercurial/merge.py	Tue Aug 08 09:19:20 2006 -0500
@@ -49,6 +49,10 @@
 
 def update(repo, node, branchmerge=False, force=False, partial=None,
            forcemerge=False, wlock=None, show_stats=True, remind=True):
+
+    if not wlock:
+        wlock = repo.wlock()
+
     pl = repo.dirstate.parents()
     if not force and pl[1] != nullid:
         raise util.Abort(_("outstanding uncommitted merges"))
@@ -110,8 +114,6 @@
         mw[f] = ""
         mfw[f] = util.is_exec(repo.wjoin(f), mfw.get(f, False))
 
-    if not partial and not wlock: wlock = repo.wlock()
-
     for f in deleted + removed:
         if f in mw:
             del mw[f]