Mercurial > hg

changeset 11430:6bee25d51a7d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with i18n
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Jun 2010 15:33:58 -0500
parents d420ff348c49 (diff) 4d03c3680400 (current diff)
children cac256790aa4
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/discovery.py	Mon Jun 21 16:59:38 2010 -0300
+++ b/mercurial/discovery.py	Tue Jun 22 15:33:58 2010 -0500
@@ -280,7 +280,7 @@
             remotemap = remote.branchmap()
             newbranches = branches - set(remotemap)
             if newbranches and not newbranch: # new branch requires --new-branch
-                branchnames = ', '.join("%s" % b for b in newbranches)
+                branchnames = ', '.join(sorted(newbranches))
                 repo.ui.warn(_("abort: push creates "
                                "new remote branches: %s!\n")
                              % branchnames)