Mercurial > public > mercurial-scm > hg

diff tests/test-merge-tools.t @ 43873:8caec25f5d8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add commands.merge.require-rev to require an argument to hg merge This is related to commands.rebase.requiredest, commands.update.requiredest, and commands.push.require-revs. Since it isn't really a "destination", I went with require-rev to be similar to push's require-revs. Differential Revision: https://phab.mercurial-scm.org/D7620
author Kyle Lippincott <spectral@google.com>
date Wed, 11 Dec 2019 19:42:05 -0800
parents 558f7585afcb
children 976b26bdd0d8
line wrap: on
line diff
--- a/tests/test-merge-tools.t	Thu Dec 12 09:59:03 2019 -0800
+++ b/tests/test-merge-tools.t	Wed Dec 11 19:42:05 2019 -0800
@@ -4,6 +4,8 @@
   $ cat >> $HGRCPATH << EOF
   > [ui]
   > merge=
+  > [commands]
+  > merge.require-rev=True
   > EOF
   $ hg init repo
   $ cd repo
@@ -1908,6 +1910,7 @@
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]
+(Testing that commands.merge.require-rev doesn't break --abort)
   $ hg merge --abort -q
 
 (for ui.merge, ignored unintentionally)