Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/commands.py @ 5053:47a8ea1eb2c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
del transaction before lock before wlock This way rollbacks happen while the repo is still locked. Deleting lock before wlock is not strictly necessary, but is more consistent with the locking order.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Thu, 02 Aug 2007 01:56:08 -0300
parents c0417a319e39
children 0f594cc36aed d5126a0172ba
line wrap: on
line diff
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1623,7 +1623,7 @@ def import_(ui, repo, patch1, *patches, 
             finally:
                 os.unlink(tmpname)
     finally:
-        del wlock, lock
+        del lock, wlock
 
 def incoming(ui, repo, source="default", **opts):
     """show new changesets found in source