# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1213609879 -7200
# Node ID bb1575f74f27070e3c58083608837c192dd8df35
# Parent  76021ec849c876bde6fc85485e81cc4d835036fd# Parent  4fa7701918ed4fab87532ba7f721e2de53e9ae03
merge with crew-stable

diff -r 76021ec849c8 -r bb1575f74f27 mercurial/commands.py
--- a/mercurial/commands.py	Sun Jun 15 13:05:39 2008 +0200
+++ b/mercurial/commands.py	Mon Jun 16 11:51:19 2008 +0200
@@ -382,7 +382,8 @@
                             for n in repo.heads()]
     branches = [(tag in activebranches, repo.changelog.rev(node), tag)
                             for tag, node in repo.branchtags().items()]
-    branches.sort(reverse=True)
+    branches.sort()
+    branches.reverse()
 
     for isactive, node, tag in branches:
         if (not active) or isactive:
diff -r 76021ec849c8 -r bb1575f74f27 tests/run-tests.py
--- a/tests/run-tests.py	Sun Jun 15 13:05:39 2008 +0200
+++ b/tests/run-tests.py	Mon Jun 16 11:51:19 2008 +0200
@@ -67,7 +67,7 @@
     help="test existing install at given location")
 
 for option, default in defaults.items():
-    defaults[option] = os.environ.get(*default)
+    defaults[option] = int(os.environ.get(*default))
 parser.set_defaults(**defaults)
 (options, args) = parser.parse_args()
 verbose = options.verbose