Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Report on push/pull if heads are merged, too, like for new heads.
authorThomas Arendsen Hein <thomas@intevation.de>
Sat, 10 Jun 2006 17:39:29 +0200
changeset 2424 092039246d73
parent 2423 f328e8aeff8b
child 2426 fb942bc15ef9
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.
mercurial/localrepo.py file | annotate | diff | comparison | revisions
tests/test-push-warn.out file | annotate | diff | comparison | revisions 
--- 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")
--- 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)
Mercurial