Mercurial > public > mercurial-scm > hg

diff tests/test-merge-default.t @ 39626:6ecfd12f09cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
identify: change {parents} to a list of nodes (BC) This is a part of the name unification. {parents} is a list of nodes in "hg log -Tjson" output. Since {rev} can be computed from (repo, node) pair, we no longer need to put it to provide {rev} to user templates. https://www.mercurial-scm.org/wiki/GenericTemplatingPlan#Dictionary
author Yuya Nishihara <yuya@tcha.org>
date Sat, 01 Sep 2018 12:15:02 +0900
parents 10c5eacd793f
children 8197b395710e
line wrap: on
line diff
--- a/tests/test-merge-default.t	Sat Sep 01 12:09:22 2018 +0900
+++ b/tests/test-merge-default.t	Sat Sep 01 12:15:02 2018 +0900
@@ -57,7 +57,7 @@
     "dirty": "+",
     "id": "f25cbe84d8b320e298e7703f18a25a3959518c23+2d95304fed5d89bc9d70b2a0d02f0d567469c3ab+",
     "node": "ffffffffffffffffffffffffffffffffffffffff",
-    "parents": [{"node": "f25cbe84d8b320e298e7703f18a25a3959518c23", "rev": 4}, {"node": "2d95304fed5d89bc9d70b2a0d02f0d567469c3ab", "rev": 2}],
+    "parents": ["f25cbe84d8b320e298e7703f18a25a3959518c23", "2d95304fed5d89bc9d70b2a0d02f0d567469c3ab"],
     "tags": ["tip"]
    }
   ]