Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 16010:c7811ca6fb94 stable
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 | eb85d5f89fef |
line wrap: on
line diff
--- a/mercurial/commands.py Fri Jan 27 14:19:32 2012 -0600 +++ b/mercurial/commands.py Fri Jan 27 13:12:56 2012 -0600 @@ -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)