Mercurial > public > mercurial-scm > hg-stable

diff mercurial/hg.py @ 17704:3d1a781b23c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 04 Oct 2012 10:11:17 +0200
parents fdd0fc046cf1 4a07d2ff7c66
children e6067bec18da
line wrap: on
line diff
--- 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: