# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2013-09-24 02:02:32
# Node ID a9abdb168425276439d8eaa16cf8b1f85dd37760
# Parent  544848ef65f284f507002d9ae37d8b15b305c7f5

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.

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4527,6 +4527,8 @@ def postincoming(ui, repo, modheads, opt
             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()):