Mercurial > hg > mercurial-source

changeset 19797:a9abdb168425

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull: for pull --update with failed update, print hint if any An upcoming patch will add a hint to the abort message, and we don't want to lose that here.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 23 Sep 2013 19:02:32 -0700
parents 544848ef65f2
children 76df01e56e7f
files mercurial/commands.py
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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()):