# HG changeset patch
# User David Soria Parra <dsp@php.net>
# Date 1297816122 -3600
# Node ID 25b5694b9337a299cdf75551829477efaff12a59
# Parent  a0e49e12915178da3e167ca21bf2295ca4c791a0
update: preserve possible bookmark name to set current bookmark correctly

diff -r a0e49e129151 -r 25b5694b9337 mercurial/commands.py
--- a/mercurial/commands.py	Wed Feb 16 10:02:24 2011 +0100
+++ b/mercurial/commands.py	Wed Feb 16 01:28:42 2011 +0100
@@ -4036,6 +4036,8 @@
     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 @@
         ret = hg.update(repo, rev)
 
     if repo.ui.configbool('bookmarks', 'track.current'):
-        bookmarks.setcurrent(repo, rev)
+        bookmarks.setcurrent(repo, brev)
 
     return ret