Mercurial > public > mercurial-scm > hg-stable

diff tests/test-merge-default.t @ 12316:4134686b83e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add exit codes to unified tests
author Matt Mackall <mpm@selenic.com>
date Thu, 16 Sep 2010 17:51:32 -0500
parents 9b3c02c36d92
children 41885892796e 6c8573dd1b6b
line wrap: on
line diff
--- a/tests/test-merge-default.t	Thu Sep 16 16:12:26 2010 -0500
+++ b/tests/test-merge-default.t	Thu Sep 16 17:51:32 2010 -0500
@@ -29,6 +29,7 @@
   $ hg merge
   abort: branch 'default' has 3 heads - please merge with an explicit rev
   (run 'hg heads .' to see heads)
+  [255]
 
   $ hg up
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -39,6 +40,7 @@
   $ hg merge
   abort: branch 'default' has 3 heads - please merge with an explicit rev
   (run 'hg heads .' to see heads)
+  [255]
 
 Should succeed:
 
@@ -65,6 +67,7 @@
 
   $ hg merge
   abort: there is nothing to merge
+  [255]
 
   $ hg up 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -73,6 +76,7 @@
 
   $ hg merge
   abort: there is nothing to merge - use "hg update" instead
+  [255]
 
   $ hg up 3
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -87,6 +91,7 @@
   $ hg merge
   abort: branch 'foobranch' has one head - please merge with an explicit rev
   (run 'hg heads' to see all heads)
+  [255]
 
 
 Test for issue2043: ensure that 'merge -P' shows ancestors of 6 that