changeset 24945 | e0b0fbd47491 |
parent 24440 | 27ad6b91f5c2 |
child 25365 | 4cc3fb23881d |
--- a/mercurial/hg.py Mon Apr 13 21:53:37 2015 -0700 +++ b/mercurial/hg.py Mon Apr 13 22:27:01 2015 -0700 @@ -497,7 +497,7 @@ destrepo.ui.status(status) _update(destrepo, uprev) if update in destrepo._bookmarks: - bookmarks.setcurrent(destrepo, update) + bookmarks.activate(destrepo, update) finally: release(srclock, destlock) if cleandir is not None: