# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1327332072 -3600
# Node ID cac01b4e4a6cdc597d2e0ec58f035b11badf4191
# Parent  91e083fab1a324c7f1813ccf3b7b4b7358aefe5c# Parent  2890e1f3d8e4358c39f58543c1c9fe5e85bfd038
Merge with stable

diff -r 91e083fab1a3 -r cac01b4e4a6c tests/run-tests.py
--- a/tests/run-tests.py	Sun Jan 15 13:37:33 2012 +0100
+++ b/tests/run-tests.py	Mon Jan 23 16:21:12 2012 +0100
@@ -98,7 +98,7 @@
     'jobs': ('HGTEST_JOBS', 1),
     'timeout': ('HGTEST_TIMEOUT', 180),
     'port': ('HGTEST_PORT', 20059),
-    'shell': ('HGTEST_SHELL', '/bin/sh'),
+    'shell': ('HGTEST_SHELL', 'sh'),
 }
 
 def parselistfiles(files, listtype, warn=True):
@@ -200,6 +200,7 @@
         options.pure = True
 
     if options.with_hg:
+        options.with_hg = os.path.expanduser(options.with_hg)
         if not (os.path.isfile(options.with_hg) and
                 os.access(options.with_hg, os.X_OK)):
             parser.error('--with-hg must specify an executable hg script')
@@ -598,6 +599,8 @@
     f.close()
 
     script = []
+    if options.debug:
+        script.append('set -x\n')
     if os.getenv('MSYSTEM'):
         script.append('alias pwd="pwd -W"\n')
     for n, l in enumerate(t):
diff -r 91e083fab1a3 -r cac01b4e4a6c tests/test-keyword.t
--- a/tests/test-keyword.t	Sun Jan 15 13:37:33 2012 +0100
+++ b/tests/test-keyword.t	Mon Jan 23 16:21:12 2012 +0100
@@ -556,6 +556,7 @@
 Commit and show expansion in original and copy
 
   $ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>'
+  invalidating branch cache (tip differs)
   c
    c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
   overwriting c expanding keywords