diff -r 04aeaec6ec07 -r 3d917da5bd95 tests/test-prev-next.t
--- a/tests/test-prev-next.t	Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-prev-next.t	Thu Oct 25 16:33:10 2018 +0200
@@ -183,7 +183,7 @@
 some aspiring children
 
   $ hg amend -m 'added b (2)'
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg next
   no children
   (1 unstable changesets to be evolved here, do you want --evolve?)
@@ -230,7 +230,7 @@
 next with ambiguity in aspiring children
 
   $ hg am -m 'added b (3)'
-  2 new orphan changesets
+  2 new unstable changesets
   $ hg next
   no children
   (2 unstable changesets to be evolved here, do you want --evolve?)
@@ -348,7 +348,7 @@
   $ sleep 1
   $ hg next --evolve
   waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob)
-  1 new orphan changesets
+  1 new unstable changesets
   got lock after [4-6] seconds (re)
   move:[2] two
   atop:[3] one
@@ -369,115 +369,10 @@
   $ echo foobar > bar
   $ hg add bar
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
 
   $ echo babar > bar
 
   $ hg next --evolve
   abort: uncommitted changes
   [255]
-
-  $ cd ..
-
-Testing that `next` and `prev` respects `commands.update.check=noconflict`
-
-  $ hg init noconflict
-  $ cd noconflict
-  $ echo "[commands]" >> .hg/hgrc
-  $ echo "update.check=noconflict" >> .hg/hgrc
-
-  $ echo hi > wat
-  $ hg ci -Aqm "added wat"
-  $ echo hi > foo
-  $ hg ci -Aqm "added foo"
-  $ echo hi > bar
-  $ hg ci -Aqm "added bar"
-
-testing for `hg prev`
-
-  $ echo bar > wat
-  $ hg prev
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  [1] added foo
-  $ hg diff
-  diff -r cf959ce4e1ff wat
-  --- a/wat	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/wat	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,1 +1,1 @@
-  -hi
-  +bar
-
-testing for `hg next`
-
-  $ hg next
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  [2] added bar
-  $ hg diff
-  diff -r ac3de1218820 wat
-  --- a/wat	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/wat	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,1 +1,1 @@
-  -hi
-  +bar
-
-test that we dont end up in merge conflicts
-
-  $ echo bar > bar
-  $ hg prev
-  abort: conflicting changes
-  (do you want --merge?)
-  [255]
-
-  $ echo hi > bar
-  $ hg prev
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  [1] added foo
-  $ echo bar > bar
-  $ hg add bar
-
-  $ hg next
-  abort: conflicting changes
-  (do you want --merge?)
-  [255]
-
-Test that --merge still works fine with commands.update.check set
-
-XXX: yes we want --merge and we passed that!
-  $ echo hi > bar
-  $ echo bar >> bar
-  $ hg next --merge
-  merging bar
-  warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
-  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges
-  [2] added bar
-
-  $ echo babar > bar
-  $ hg resolve -m
-  (no more unresolved files)
-
-Testing --merge works with other values of commands.update.check also
-
-XXX: things are broken!
-  $ hg prev --merge --config commands.update.check=abort
-  local [working copy] changed bar which other [destination] deleted
-  use (c)hanged version, (d)elete, or leave (u)nresolved? 
-  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges
-  [1] added foo
-
-  $ hg revert --all
-  forgetting bar
-  reverting wat
-  $ hg resolve -m
-  (no more unresolved files)
-
-  $ echo bar > bar
-  $ hg add bar
-
-  $ hg next --merge --config commands.update.check=abort
-  merging bar
-  warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
-  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges
-  [2] added bar