diff tests/test-prev-next.t @ 3813:27e7ed2d13a6 stable

next-prev: always respect the --merge flag

An earlier bug fix series which started respecting commands.update.check
introduced a bug in which --merge was not respected sometimes. This patch fixes
that behavior by passing updatecheck as 'none' to hg.updatetotally() if --merge
is passed which is similar to what `hg update` does.

--- a/tests/test-prev-next.t	Fri Jun 08 18:32:48 2018 +0530
+++ b/tests/test-prev-next.t	Fri Jun 08 17:36:28 2018 +0530
@@ -446,26 +446,38 @@
   $ echo hi > bar
   $ echo bar >> bar
   $ hg next --merge
-  abort: conflicting changes
-  (do you want --merge?)
-  [255]
+  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
-  abort: uncommitted changes
-  (do you want --merge?)
-  [255]
+  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
-  abort: uncommitted changes
-  (do you want --merge?)
-  [255]
+  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