changeset 19797 | a9abdb168425 |
parent 19757 | ff00839e8bb3 |
child 19801 | 41abe2e3e3b7 |
--- a/mercurial/commands.py Fri Sep 06 13:30:57 2013 +0400 +++ b/mercurial/commands.py Mon Sep 23 19:02:32 2013 -0700 @@ -4527,6 +4527,8 @@ ret = hg.update(repo, checkout) except util.Abort, inst: ui.warn(_("not updating: %s\n") % str(inst)) + if inst.hint: + ui.warn(_("(%s)\n") % inst.hint) return 0 if not ret and not checkout: if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):