Mercurial > hg-stable
diff mercurial/localrepo.py @ 2424:092039246d73
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.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Sat, 10 Jun 2006 17:39:29 +0200 |
| parents | 8ed45fb1053a |
| children | e8c4f3d3df8c |
line wrap: on
line diff
--- 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")