Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: add a test for `--merge` overriding the "abort" config
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 03 Dec 2021 12:19:36 +0100
changeset 48406 51f521900473
parent 48405 acdd4a42deaa
child 48407 4d59e0f909e0
update: add a test for `--merge` overriding the "abort" config I don't see this behavior tested anywhere. Differential Revision: https://phab.mercurial-scm.org/D11850
tests/test-update-branches.t file | annotate | diff | comparison | revisions 
--- a/tests/test-update-branches.t	Fri Dec 03 12:01:00 2021 +0100
+++ b/tests/test-update-branches.t	Fri Dec 03 12:19:36 2021 +0100
@@ -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
mercurial