--- a/mercurial/commands.py Sat Aug 02 17:04:53 2014 -0700
+++ b/mercurial/commands.py Mon Aug 11 11:24:05 2014 -0500
@@ -5901,7 +5901,7 @@
'bundle:' + fname)
finally:
lock.release()
- bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
+
return postincoming(ui, repo, modheads, opts.get('update'), None)
@command('^update|up|checkout|co',
--- a/tests/test-bookmarks.t Sat Aug 02 17:04:53 2014 -0700
+++ b/tests/test-bookmarks.t Mon Aug 11 11:24:05 2014 -0500
@@ -496,13 +496,12 @@
parent: 2:db815d6d32e6
2
branch: default
- bookmarks: [Z] Y x y
+ bookmarks: *Z Y x y
commit: 1 added, 1 unknown (new branch head)
update: 2 new changesets (update)
$ hg update
- updating to active bookmark Z
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- (activating bookmark Z)
+ updating bookmark Z
$ hg bookmarks
X2 1:925d80f479bb
Y 2:db815d6d32e6