Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
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
authorSiddharth Agarwal <sid0@fb.com>
Mon, 23 Sep 2013 19:02:32 -0700
changeset 19797 a9abdb168425
parent 19796 544848ef65f2
child 19798 76df01e56e7f
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.
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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()):
Mercurial