Patchwork D11850: update: add a test for `--merge` overriding the "abort" config

login
register
mail settings
Submitter phabricator
Date Dec. 3, 2021, 2:10 p.m.
Message ID <differential-rev-PHID-DREV-ohz2f2pyacg7vxahnwfw-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/50176/
State Superseded
Headers show

Comments

phabricator - Dec. 3, 2021, 2:10 p.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  I don't see this behavior tested anywhere.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  tests/test-update-branches.t

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

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