Mercurial > hg-stable

changeset 13415:25b5694b9337

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: preserve possible bookmark name to set current bookmark correctly
author David Soria Parra <dsp@php.net>
date Wed, 16 Feb 2011 01:28:42 +0100
parents a0e49e129151
children 5431b3f3e52e
files mercurial/commands.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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