--- a/mercurial/commands.py Fri Mar 11 20:43:12 2011 -0500
+++ b/mercurial/commands.py Mon Mar 28 20:56:56 2011 -0400
@@ -2989,8 +2989,11 @@
else:
ui.status(_("not updating, since new heads added\n"))
if modheads > 1:
- if (len(repo.branchheads()) > 1):
+ currentbranchheads = len(repo.branchheads())
+ if currentbranchheads == modheads:
ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
+ elif currentbranchheads > 1:
+ ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to merge)\n"))
else:
ui.status(_("(run 'hg heads' to see heads)\n"))
else: