# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1347573749 -3600
# Node ID 13a3f6161af826af1dba3f7cab296fdf01c62eb5
# Parent  193e68a0c8d267cdea2241232582253a83d826b4# Parent  1938c2ebf5173ccd65679057926a849c0e5a9474
Merge with stable

diff -r 193e68a0c8d2 -r 13a3f6161af8 tests/run-tests.py
--- a/tests/run-tests.py	Wed Sep 12 18:44:43 2012 +0100
+++ b/tests/run-tests.py	Thu Sep 13 23:02:29 2012 +0100
@@ -1211,6 +1211,10 @@
             # can't remove on solaris
             os.environ[k] = ''
             del os.environ[k]
+    if 'HG' in os.environ:
+        # can't remove on solaris
+        os.environ['HG'] = ''
+        del os.environ['HG']
 
     global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE
     TESTDIR = os.environ["TESTDIR"] = os.getcwd()