Fix bad merge with crew
authorBrendan Cully <brendan@kublai.com>
Fri, 11 Aug 2006 16:30:24 -0700
changeset 2861 1f813d4fbcc8
parent 2860 0f08f2c042ec
child 2862 f3c68e0ca37d
Fix bad merge with crew
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)