--- a/mercurial/hg.py Wed Apr 22 02:01:22 2009 +0200
+++ b/mercurial/hg.py Wed Apr 22 02:01:22 2009 +0200
@@ -7,6 +7,7 @@
# of the GNU General Public License, incorporated herein by reference.
from i18n import _
+from lock import release
import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo
import errno, lock, os, shutil, util, extensions, error
import merge as _merge
@@ -249,7 +250,8 @@
return src_repo, dest_repo
finally:
- del src_lock, dest_lock, dir_cleanup
+ release(src_lock, dest_lock)
+ del dir_cleanup
def _showstats(repo, stats):
stats = ((stats[0], _("updated")),