##// END OF EJS Templates
pull: for pull --update with failed update, print hint if any...
Siddharth Agarwal -
r19797:a9abdb16 default
parent child Browse files
Show More
@@ -4527,6 +4527,8 b' def postincoming(ui, repo, modheads, opt'
4527 ret = hg.update(repo, checkout)
4527 ret = hg.update(repo, checkout)
4528 except util.Abort, inst:
4528 except util.Abort, inst:
4529 ui.warn(_("not updating: %s\n") % str(inst))
4529 ui.warn(_("not updating: %s\n") % str(inst))
4530 if inst.hint:
4531 ui.warn(_("(%s)\n") % inst.hint)
4530 return 0
4532 return 0
4531 if not ret and not checkout:
4533 if not ret and not checkout:
4532 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4534 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
General Comments 0
You need to be logged in to leave comments. Login now