update: preserve possible bookmark name to set current bookmark correctly

mercurial/commands.py

@@ -4036,6 +4036,8 b' def update(ui, repo, node=None, rev=None'
     if not rev:
         rev = node
 
+    # if we defined a bookmark, we have to remember the original bookmark name
+    brev = rev
     rev = cmdutil.revsingle(repo, rev, rev).rev()
 
     if check and clean:
@@ -4058,7 +4060,7 b' def update(ui, repo, node=None, rev=None'
         ret = hg.update(repo, rev)
 
     if repo.ui.configbool('bookmarks', 'track.current'):
-        bookmarks.setcurrent(repo, rev)
+        bookmarks.setcurrent(repo, brev)
 
     return ret