Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/commands.py @ 2861:1f813d4fbcc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bad merge with crew
author Brendan Cully <brendan@kublai.com>
date Fri, 11 Aug 2006 16:30:24 -0700
parents 0f08f2c042ec
children 71e78f2ca5ae
line wrap: on
line diff
--- 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)