##// END OF EJS Templates
commands: check for modheads being None...
Gregory Szorc -
r41427:2f2a7ea6 default
parent child Browse files
Show More
@@ -4362,7 +4362,7 b' def postincoming(ui, repo, modheads, opt'
4362 msg = _("not updating: %s") % stringutil.forcebytestr(inst)
4362 msg = _("not updating: %s") % stringutil.forcebytestr(inst)
4363 hint = inst.hint
4363 hint = inst.hint
4364 raise error.UpdateAbort(msg, hint=hint)
4364 raise error.UpdateAbort(msg, hint=hint)
4365 if modheads > 1:
4365 if modheads is not None and modheads > 1:
4366 currentbranchheads = len(repo.branchheads())
4366 currentbranchheads = len(repo.branchheads())
4367 if currentbranchheads == modheads:
4367 if currentbranchheads == modheads:
4368 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4368 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
General Comments 0
You need to be logged in to leave comments. Login now