merge with -stable
authorBenoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 17 Aug 2007 00:43:49 +0200
changeset 5186 0d5d03844927
parent 5184 fe4d9f7161ac (current diff)
parent 5185 156f4c8a12aa (diff)
child 5187 c1dbc9ae8f2b
merge with -stable
mercurial/hg.py
--- a/mercurial/hg.py	Thu Aug 16 08:23:14 2007 +0200
+++ b/mercurial/hg.py	Fri Aug 17 00:43:49 2007 +0200
@@ -205,6 +205,9 @@
             else:
                 raise util.Abort(_("clone from remote to remote not supported"))
 
+        if dir_cleanup:
+            dir_cleanup.close()
+
         if dest_repo.local():
             fp = dest_repo.opener("hgrc", "w", text=True)
             fp.write("[paths]\n")
@@ -217,8 +220,6 @@
                 except:
                     checkout = dest_repo.changelog.tip()
                 _update(dest_repo, checkout)
-        if dir_cleanup:
-            dir_cleanup.close()
 
         return src_repo, dest_repo
     finally: