diff tests/test-prev-next.t @ 5714:b3d9e6c805d6 stable

tests: update with more detailed exit codes CORE-TEST-OUTPUT-UPDATE: 21733e8c924f CORE-TEST-OUTPUT-UPDATE: 8d72e29ad1e0 CORE-TEST-OUTPUT-UPDATE: e0dbfbd4062c CORE-TEST-OUTPUT-UPDATE: ebee234d952a CORE-TEST-OUTPUT-UPDATE: 527ce85c2e60 CORE-TEST-OUTPUT-UPDATE: 3175b0e0058b CORE-TEST-OUTPUT-UPDATE: f96fa4de5055 CORE-TEST-OUTPUT-UPDATE: 96ca817ec192
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 19 Nov 2020 08:28:45 -0800
parents f65b2a978a1e
children 61d2f1cf90f0
line wrap: on
line diff
--- a/tests/test-prev-next.t	Thu Jan 21 19:05:17 2021 +0800
+++ b/tests/test-prev-next.t	Thu Nov 19 08:28:45 2020 -0800
@@ -125,14 +125,14 @@
   $ hg prev
   abort: uncommitted changes
   (do you want --merge?)
-  [255]
+  [20]
   $ hg prev --merge
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   [0] added a
   $ hg next
   abort: uncommitted changes
   (do you want --merge?)
-  [255]
+  [20]
   $ hg next --merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   [1] added b
@@ -380,7 +380,7 @@
   $ hg next --evolve
   abort: uncommitted changes
   (use `hg amend`, `hg revert` or `hg shelve`)
-  [255]
+  [20]
 
   $ cd ..
 
@@ -471,7 +471,7 @@
   $ hg prev --config commands.update.check=abort
   abort: uncommitted changes
   (do you want --merge?)
-  [255]
+  [20]
   $ hg prev --merge --config commands.update.check=abort
   file 'bar' was deleted in other [destination] but was modified in local [working copy].
   You can use (c)hanged version, (d)elete, or leave (u)nresolved.
@@ -492,7 +492,7 @@
   $ hg next --config commands.update.check=abort
   abort: uncommitted changes
   (do you want --merge?)
-  [255]
+  [20]
   $ hg next --merge --config commands.update.check=abort
   merging bar
   warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')