diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -714,7 +714,7 @@ def updatetotally(ui, repo, checkout, br This returns whether conflict is detected at updating or not. """ - if True: + with repo.wlock(): movemarkfrom = None warndest = False if checkout is None: