Mercurial > public > mercurial-scm > hg-stable

diff tests/test-merge1.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 4c94b6d0fb1c
children 545ec1775021
line wrap: on
line diff
--- a/tests/test-merge1.t	Thu Sep 16 16:12:26 2010 -0500
+++ b/tests/test-merge1.t	Thu Sep 16 17:51:32 2010 -0500
@@ -69,6 +69,7 @@
 merge should fail
   $ hg merge 1
   abort: untracked file in working directory differs from file in requested revision: 'b'
+  [255]
 merge of b expected
   $ hg merge -f 1
   merging for b
@@ -111,6 +112,7 @@
 merge fails
   $ hg merge 2
   abort: outstanding uncommitted changes (use 'hg status' to list changes)
+  [255]
   $ echo %% merge expected!
   %% merge expected!
   $ hg merge -f 2
@@ -148,6 +150,7 @@
 merge of b should fail
   $ hg merge 2
   abort: outstanding uncommitted changes (use 'hg status' to list changes)
+  [255]
 merge of b expected
   $ hg merge -f 2
   merging for b