##// END OF EJS Templates
merge with -stable
Benoit Boissinot -
r5186:0d5d0384 merge default
parent child Browse files
Show More
@@ -205,6 +205,9 b' def clone(ui, source, dest=None, pull=Fa'
205 else:
205 else:
206 raise util.Abort(_("clone from remote to remote not supported"))
206 raise util.Abort(_("clone from remote to remote not supported"))
207
207
208 if dir_cleanup:
209 dir_cleanup.close()
210
208 if dest_repo.local():
211 if dest_repo.local():
209 fp = dest_repo.opener("hgrc", "w", text=True)
212 fp = dest_repo.opener("hgrc", "w", text=True)
210 fp.write("[paths]\n")
213 fp.write("[paths]\n")
@@ -217,8 +220,6 b' def clone(ui, source, dest=None, pull=Fa'
217 except:
220 except:
218 checkout = dest_repo.changelog.tip()
221 checkout = dest_repo.changelog.tip()
219 _update(dest_repo, checkout)
222 _update(dest_repo, checkout)
220 if dir_cleanup:
221 dir_cleanup.close()
222
223
223 return src_repo, dest_repo
224 return src_repo, dest_repo
224 finally:
225 finally:
General Comments 0
You need to be logged in to leave comments. Login now