--- a/tests/test-merge-default.t Sat Jun 24 15:11:05 2017 -0700
+++ b/tests/test-merge-default.t Sat Jun 24 23:09:21 2017 -0400
@@ -49,6 +49,19 @@
$ hg merge 2
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
+ $ hg id -Tjson
+ [
+ {
+ "bookmarks": [],
+ "branch": "default",
+ "changed": "+",
+ "id": "f25cbe84d8b3+2d95304fed5d+",
+ "node": "ffffffffffffffffffffffffffffffffffffffff",
+ "p1": [{"node": "f25cbe84d8b320e298e7703f18a25a3959518c23", "rev": 4}],
+ "p2": [{"node": "2d95304fed5d89bc9d70b2a0d02f0d567469c3ab", "rev": 2}],
+ "tags": ["tip"]
+ }
+ ]
$ hg commit -mm1
Should succeed - 2 heads:
@@ -65,6 +78,17 @@
(branch merge, don't forget to commit)
$ hg commit -mm2
+ $ hg id -r 1 -Tjson
+ [
+ {
+ "bookmarks": [],
+ "branch": "default",
+ "id": "1846eede8b68",
+ "node": "1846eede8b6886d8cc8a88c96a687b7fe8f3b9d1",
+ "tags": []
+ }
+ ]
+
Should fail because at tip:
$ hg merge