Mercurial > evolve

changeset 5716:a4e50b74747e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update exit code in case of unresolved merge conflicts CORE-TEST-OUTPUT-UPDATE: fa87536d3d70
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 02 Dec 2020 09:55:33 +0800
parents 2238dd83c5b3
children 38ab502ad94e
files tests/test-evolve-issue5966.t tests/test-unstability-resolution-result.t
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-issue5966.t	Thu Nov 26 14:26:40 2020 +0800
+++ b/tests/test-evolve-issue5966.t	Wed Dec 02 09:55:33 2020 +0800
@@ -73,13 +73,13 @@
   U a
   $ hg evolve --continue
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [255]
+  [20]
 
 (even when ran twice)
 
   $ hg evolve --continue
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [255]
+  [20]
 
   $ cat a
   apricot
--- a/tests/test-unstability-resolution-result.t	Thu Nov 26 14:26:40 2020 +0800
+++ b/tests/test-unstability-resolution-result.t	Wed Dec 02 09:55:33 2020 +0800
@@ -104,7 +104,7 @@
   +newer a
   $ hg evolve --continue
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [255]
+  [20]
   $ hg resolve -m a
   (no more unresolved files)
   continue: hg evolve --continue