# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1349861461 -7200
# Node ID 2d9daef1e473005960545bda37456171866643d3
# Parent  183d7e3d7ce8b6fe52783fbd5c87a5631c924218# Parent  294cea906d3ad5a718fa392b7c6be40ae31764d0
Merge with stable

diff -r 183d7e3d7ce8 -r 2d9daef1e473 tests/hghave.py
--- a/tests/hghave.py	Wed Sep 19 00:59:23 2012 +0100
+++ b/tests/hghave.py	Wed Oct 10 11:31:01 2012 +0200
@@ -152,7 +152,7 @@
         return False
 
 def getsvnversion():
-    m = matchoutput('svn --version 2>&1', r'^svn,\s+version\s+(\d+)\.(\d+)')
+    m = matchoutput('svn --version --quiet 2>&1', r'^(\d+)\.(\d+)')
     if not m:
         return (0, 0)
     return (int(m.group(1)), int(m.group(2)))
diff -r 183d7e3d7ce8 -r 2d9daef1e473 tests/run-tests.py
--- a/tests/run-tests.py	Wed Sep 19 00:59:23 2012 +0100
+++ b/tests/run-tests.py	Wed Oct 10 11:31:01 2012 +0200
@@ -684,7 +684,7 @@
     pos = -1
     postout = []
     ret = 0
-    for n, l in enumerate(output):
+    for l in output:
         lout, lcmd = l, None
         if salt in l:
             lout, lcmd = l.split(salt, 1)