# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1149953969 -7200
# Node ID 092039246d7335342e9a68be90fa625bd3780647
# Parent  f328e8aeff8bd0d33b0d57481776aa56cc4a9fdf
Report on push/pull if heads are merged, too, like for new heads.

Use case: If a remote repo has two heads and I _want_ to merge them, I merge
and push. Meanwhile someone else pushed on top of one of the heads. He won't
get a warning, because he doesn't create a new head, I won't notice that I
don't close a head, because I don't get a message telling me.

diff -r f328e8aeff8b -r 092039246d73 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Sat Jun 10 11:28:40 2006 +0200
+++ b/mercurial/localrepo.py	Sat Jun 10 17:39:29 2006 +0200
@@ -1550,8 +1550,8 @@
 
         newheads = len(self.changelog.heads())
         heads = ""
-        if oldheads and newheads > oldheads:
-            heads = _(" (+%d heads)") % (newheads - oldheads)
+        if oldheads and newheads != oldheads:
+            heads = _(" (%+d heads)") % (newheads - oldheads)
 
         self.ui.status(_("added %d changesets"
                          " with %d changes to %d files%s\n")
diff -r f328e8aeff8b -r 092039246d73 tests/test-push-warn.out
--- a/tests/test-push-warn.out	Sat Jun 10 11:28:40 2006 +0200
+++ b/tests/test-push-warn.out	Sat Jun 10 17:39:29 2006 +0200
@@ -47,4 +47,4 @@
 adding changesets
 adding manifests
 adding file changes
-added 1 changesets with 1 changes to 1 files
+added 1 changesets with 1 changes to 1 files (-1 heads)