Mercurial > hg > mercurial-source

changeset 16013:c7811ca6fb94 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: note updated bookmark This brings update in line with pull: we notify the user when an action indirectly updates a bookmark.
author Kevin Bullock <kbullock@ringworld.org>
date Fri, 27 Jan 2012 13:12:56 -0600
parents f1208827df7c
children f2c49d9dee57
files mercurial/commands.py tests/test-bookmarks-pushpull.t
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)
 
--- 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