Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/commands.py
changeset 41382 2f2a7ea62e9a
parent 41368 609d6d8646db
child 41397 0bd56c291359 
--- a/mercurial/commands.py	Fri Jan 25 15:21:56 2019 -0800
+++ b/mercurial/commands.py	Fri Jan 25 15:31:07 2019 -0800
@@ -4362,7 +4362,7 @@
             msg = _("not updating: %s") % stringutil.forcebytestr(inst)
             hint = inst.hint
             raise error.UpdateAbort(msg, hint=hint)
-    if modheads > 1:
+    if modheads is not None and modheads > 1:
         currentbranchheads = len(repo.branchheads())
         if currentbranchheads == modheads:
             ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
Mercurial