diff tests/test-prev-next.t @ 4475:256b28ce03e3

next: clarify tests related to `commands.update.check` test

This clarify the test and help understand the next changeset.

--- a/tests/test-prev-next.t	Wed Apr 03 17:20:34 2019 +0800
+++ b/tests/test-prev-next.t	Fri Apr 05 22:28:07 2019 +0200
@@ -444,8 +444,14 @@
 Test that --merge still works fine with commands.update.check set
 
 XXX: yes we want --merge and we passed that!
+  $ hg config commands.update.check
+  noconflict
   $ echo hi > bar
   $ echo bar >> bar
+  $ hg next
+  abort: conflicting changes
+  (do you want --merge?)
+  [255]
   $ hg next --merge
   merging bar
   warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
@@ -460,6 +466,10 @@
 Testing --merge works with other values of commands.update.check also
 
 XXX: things are broken!
+  $ hg prev --config commands.update.check=abort
+  abort: uncommitted changes
+  (do you want --merge?)
+  [255]
   $ hg prev --merge --config commands.update.check=abort
   file 'bar' was deleted in other [destination] but was modified in local [working copy].
   What do you want to do?
@@ -477,6 +487,10 @@
   $ echo bar > bar
   $ hg add bar
 
+  $ hg next --config commands.update.check=abort
+  abort: uncommitted changes
+  (do you want --merge?)
+  [255]
   $ hg next --merge --config commands.update.check=abort
   merging bar
   warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')