mercurial/bookmarks.py

--- a/mercurial/bookmarks.py	Wed Feb 16 01:28:42 2011 +0100
+++ b/mercurial/bookmarks.py	Wed Feb 16 01:29:26 2011 +0100
@@ -109,16 +109,10 @@
 def update(repo, parents, node):
     marks = repo._bookmarks
     update = False
-    if repo.ui.configbool('bookmarks', 'track.current'):
-        mark = repo._bookmarkcurrent
-        if mark and marks[mark] in parents:
-            marks[mark] = node
-            update = True
-    else:
-        for mark, n in marks.items():
-            if n in parents:
-                marks[mark] = node
-                update = True
+    mark = repo._bookmarkcurrent
+    if mark and marks[mark] in parents:
+        marks[mark] = node
+        update = True
     if update:
         write(repo)