equal
deleted
inserted
replaced
495 bn = destrepo[uprev].branch() |
495 bn = destrepo[uprev].branch() |
496 status = _("updating to branch %s\n") % bn |
496 status = _("updating to branch %s\n") % bn |
497 destrepo.ui.status(status) |
497 destrepo.ui.status(status) |
498 _update(destrepo, uprev) |
498 _update(destrepo, uprev) |
499 if update in destrepo._bookmarks: |
499 if update in destrepo._bookmarks: |
500 bookmarks.setcurrent(destrepo, update) |
500 bookmarks.activate(destrepo, update) |
501 finally: |
501 finally: |
502 release(srclock, destlock) |
502 release(srclock, destlock) |
503 if cleandir is not None: |
503 if cleandir is not None: |
504 shutil.rmtree(cleandir, True) |
504 shutil.rmtree(cleandir, True) |
505 if srcpeer is not None: |
505 if srcpeer is not None: |