Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 13367:cef73cd9c268

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: merge current tracking on update into core
author Matt Mackall <mpm@selenic.com>
date Thu, 10 Feb 2011 13:46:28 -0600
parents c756e9166417
children d4ab9486e514
line wrap: on
line diff
--- a/mercurial/commands.py	Thu Feb 10 13:46:28 2011 -0600
+++ b/mercurial/commands.py	Thu Feb 10 13:46:28 2011 -0600
@@ -3893,9 +3893,14 @@
         rev = cmdutil.finddate(ui, repo, date)
 
     if clean or check:
-        return hg.clean(repo, rev)
+        ret = hg.clean(repo, rev)
     else:
-        return hg.update(repo, rev)
+        ret = hg.update(repo, rev)
+
+    if repo.ui.configbool('bookmarks', 'track.current'):
+        bookmarks.setcurrent(repo, rev)
+
+    return ret
 
 def verify(ui, repo):
     """verify the integrity of the repository