[Updated] D11850: update: add a test for `--merge` overriding the "abort" config

[marmoute (Pierre-Yves David)]

Closed by commit rHG51f521900473: update: add a test for `--merge` overriding the "abort" config (authored by marmoute).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D11850?vs=31295&id=31300

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11850/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D11850

AFFECTED FILES
  tests/test-update-branches.t

CHANGE DETAILS

diff --git a/tests/test-update-branches.t b/tests/test-update-branches.t
--- a/tests/test-update-branches.t
+++ b/tests/test-update-branches.t
@@ -221,6 +221,11 @@
   parent=1
   M foo
 
+  $ revtest '--merge none dirty linear' dirty 1 2 --merge
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  parent=2
+  M foo
+
   $ revtest 'none dirty linear' dirty 1 2 --clean
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   parent=2



To: marmoute, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20211203/a69c35e6/attachment-0002.html>