mercurial/hg.py

--- 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: