equal
deleted
inserted
replaced
426 uprev = destrepo.lookup('tip') |
426 uprev = destrepo.lookup('tip') |
427 bn = destrepo[uprev].branch() |
427 bn = destrepo[uprev].branch() |
428 destrepo.ui.status(_("updating to branch %s\n") % bn) |
428 destrepo.ui.status(_("updating to branch %s\n") % bn) |
429 _update(destrepo, uprev) |
429 _update(destrepo, uprev) |
430 if update in destrepo._bookmarks: |
430 if update in destrepo._bookmarks: |
|
431 destrepo.ui.status(_("active bookmark: %s\n") % update) |
431 bookmarks.setcurrent(destrepo, update) |
432 bookmarks.setcurrent(destrepo, update) |
432 |
433 |
433 return srcpeer, destpeer |
434 return srcpeer, destpeer |
434 finally: |
435 finally: |
435 release(srclock, destlock) |
436 release(srclock, destlock) |