changeset 17704 | 3d1a781b23c0 |
parent 17671 | fdd0fc046cf1 |
parent 17703 | 4a07d2ff7c66 |
child 17740 | e6067bec18da |
--- a/mercurial/hg.py Tue Oct 02 14:31:25 2012 -0700 +++ b/mercurial/hg.py Thu Oct 04 10:11:17 2012 +0200 @@ -410,6 +410,8 @@ bn = destrepo[uprev].branch() destrepo.ui.status(_("updating to branch %s\n") % bn) _update(destrepo, uprev) + if update in destrepo._bookmarks: + bookmarks.setcurrent(destrepo, update) return srcpeer, destpeer finally: