# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1357601400 0
# Node ID 5ac75dd311d5e374a8e9afe19f4b97793ce75242
# Parent  07a7aabca5ce16dea34cd90829cbc01ddcc8765f# Parent  6f276a9239897787171cc86cb7fa7d169dffbf8f
Merge with stable

diff -r 07a7aabca5ce -r 5ac75dd311d5 tests/hghave
--- a/tests/hghave	Fri Jan 04 20:12:31 2013 +0000
+++ b/tests/hghave	Mon Jan 07 23:30:00 2013 +0000
@@ -59,7 +59,7 @@
 
         if feature not in checks:
             error('skipped: unknown feature: ' + feature)
-            continue
+            sys.exit(2)
 
         check, desc = checks[feature]
         try:
diff -r 07a7aabca5ce -r 5ac75dd311d5 tests/run-tests.py
--- a/tests/run-tests.py	Fri Jan 04 20:12:31 2013 +0000
+++ b/tests/run-tests.py	Mon Jan 07 23:30:00 2013 +0000
@@ -602,10 +602,13 @@
         tdir = TESTDIR.replace('\\', '/')
         proc = Popen4('%s -c "%s/hghave %s"' %
                       (options.shell, tdir, ' '.join(reqs)), wd, 0)
-        proc.communicate()
+        stdout, stderr = proc.communicate()
         ret = proc.wait()
         if wifexited(ret):
             ret = os.WEXITSTATUS(ret)
+        if ret == 2:
+            print stdout
+            sys.exit(1)
         return ret == 0
 
     f = open(test)
@@ -746,7 +749,8 @@
     Return a tuple (exitcode, output).  output is None in debug mode."""
     # TODO: Use subprocess.Popen if we're running on Python 2.4
     if options.debug:
-        proc = subprocess.Popen(cmd, shell=True, cwd=wd)
+        proc = subprocess.Popen(cmd, shell=True, cwd=wd, stdin=subprocess.PIPE)
+        proc.stdin.close()
         ret = proc.wait()
         return (ret, None)
 
diff -r 07a7aabca5ce -r 5ac75dd311d5 tests/test-keyword.t
--- a/tests/test-keyword.t	Fri Jan 04 20:12:31 2013 +0000
+++ b/tests/test-keyword.t	Mon Jan 07 23:30:00 2013 +0000
@@ -747,7 +747,9 @@
 Commit with multi-line message and custom expansion
 
   $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>'
+  invalid branchheads cache: tip differs
   a
+  invalid branchheads cache: tip differs
   overwriting a expanding keywords
   committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
   $ rm log
@@ -789,6 +791,8 @@
   $ hg debugrebuildstate
   $ hg remove a
   $ hg --debug commit -m rma
+  invalid branchheads cache: tip differs
+  invalid branchheads cache: tip differs
   committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012
   $ hg status
   ? c
@@ -899,8 +903,10 @@
   [255]
   $ cd x
   $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>'
+  invalid branchheads cache: tip differs
   x/a
    x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
+  invalid branchheads cache: tip differs
   overwriting x/a expanding keywords
   committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4
   $ cat a