--- 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