# HG changeset patch # User Brendan Cully # Date 1155339024 25200 # Node ID 1f813d4fbcc82ad3825d9a2c273c85f5f3216611 # Parent 0f08f2c042ec8bec27a21268600f0656c1f59873 Fix bad merge with crew diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1825,7 +1825,6 @@ def import_(ui, repo, patch1, *patches, wlock = repo.wlock() lock = repo.lock() - wlock = repo.wlock() for p in patches: pf = os.path.join(d, p)