Mercurial > public > mercurial-scm > hg-stable

diff tests/test-merge-default.t @ 43879: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 8197b395710e
children 8d72e29ad1e0
line wrap: on
line diff
--- a/tests/test-merge-default.t	Thu Dec 12 09:59:03 2019 -0800
+++ b/tests/test-merge-default.t	Wed Dec 11 19:42:05 2019 -0800
@@ -44,9 +44,10 @@
   (run 'hg heads .' to see heads, specify rev with -r)
   [255]
 
-Should succeed:
+Should succeed (we're specifying commands.merge.require-rev=True just to test
+that it allows merge to succeed if we specify a revision):
 
-  $ hg merge 2
+  $ hg merge 2 --config commands.merge.require-rev=True
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg id -Tjson
@@ -63,6 +64,13 @@
   ]
   $ hg commit -mm1
 
+Should fail because we didn't specify a revision (even though it would have
+succeeded without this):
+
+  $ hg merge --config commands.merge.require-rev=True
+  abort: configuration requires specifying revision to merge with
+  [255]
+
 Should succeed - 2 heads:
 
   $ hg merge -P
@@ -88,6 +96,13 @@
    }
   ]
 
+Should fail because we didn't specify a revision (even though it would have
+failed without this due to being on tip, but this check comes first):
+
+  $ hg merge --config commands.merge.require-rev=True
+  abort: configuration requires specifying revision to merge with
+  [255]
+
 Should fail because at tip:
 
   $ hg merge