# HG changeset patch # User Kevin Bullock # Date 1327691576 21600 # Node ID c7811ca6fb9401d7592ffaa0b14197d73c552020 # Parent f1208827df7c381096bd75728afe283e5e02887d update: note updated bookmark This brings update in line with pull: we notify the user when an action indirectly updates a bookmark. diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -5719,7 +5719,8 @@ ret = hg.update(repo, rev) if not ret and movemarkfrom: - bookmarks.update(repo, [movemarkfrom], repo['.'].node()) + if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): + ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) elif brev in repo._bookmarks: bookmarks.setcurrent(repo, brev) diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t --- a/tests/test-bookmarks-pushpull.t +++ b/tests/test-bookmarks-pushpull.t @@ -101,6 +101,7 @@ $ cd ../b $ hg up 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + updating bookmark foobar $ echo c2 > f2 $ hg ci -Am2 adding f2