# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1284749636 -7200
# Node ID 12eadf33cce1c80c45ecb7e89153ae4f15fa3d8f
# Parent  b14093780eaf649f267e3c4ea4e4ed14f87160a5# Parent  9cc90e2c826f1be4a27cfcb7268dc5a7ef0aa322
Merge with stable

diff -r b14093780eaf -r 12eadf33cce1 tests/run-tests.py
--- a/tests/run-tests.py	Fri Sep 10 16:58:13 2010 +0200
+++ b/tests/run-tests.py	Fri Sep 17 20:53:56 2010 +0200
@@ -474,7 +474,7 @@
             after.setdefault(pos, []).append(l)
             prepos = pos
             pos = n
-            script.append('echo %s %s\n' % (salt, n))
+            script.append('echo %s %s $?\n' % (salt, n))
             script.append(l[4:])
         elif l.startswith('  > '): # continuations
             after.setdefault(prepos, []).append(l)
@@ -486,6 +486,8 @@
             # non-command/result - queue up for merged output
             after.setdefault(pos, []).append(l)
 
+    script.append('echo %s %s $?\n' % (salt, n + 1))
+
     fd, name = tempfile.mkstemp(suffix='hg-tst')
 
     try:
@@ -508,8 +510,13 @@
 
     pos = -1
     postout = []
+    ret = 0
     for n, l in enumerate(output):
         if l.startswith(salt):
+            # add on last return code
+            ret = int(l.split()[2])
+            if ret != 0:
+                postout.append("  [%s]\n" % ret)
             if pos in after:
                 postout += after.pop(pos)
             pos = int(l.split()[1])
diff -r b14093780eaf -r 12eadf33cce1 tests/test-keyword.t
--- a/tests/test-keyword.t	Fri Sep 10 16:58:13 2010 +0200
+++ b/tests/test-keyword.t	Fri Sep 17 20:53:56 2010 +0200
@@ -116,6 +116,7 @@
 
   $ hg --debug commit
   abort: empty commit message
+  [255]
   $ hg status
   A a
   A b
@@ -540,6 +541,7 @@
 
   $ hg commit
   abort: empty commit message
+  [255]
   $ hg status
   M a
   ? c
@@ -689,6 +691,7 @@
 
   $ hg --verbose kwexpand x/a
   abort: outstanding uncommitted changes
+  [255]
   $ cd x
   $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>'
   x/a
@@ -817,7 +820,8 @@
   warning: conflicts during merge.
   merging m failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
+  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+  [1]
   $ cat m
   $Id$
   <<<<<<< local