Mercurial > public > mercurial-scm > hg

diff tests/test-merge-default.t @ 33089:9e0d222f5687

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
identify: change p1/p2 to a list of parents It makes sense because the nested data structure is a list of items.
author Yuya Nishihara <yuya@tcha.org>
date Mon, 26 Jun 2017 09:18:55 +0900
parents a49ab7f5e7e7
children 10c5eacd793f
line wrap: on
line diff
--- a/tests/test-merge-default.t	Sun Jun 25 13:31:56 2017 -0700
+++ b/tests/test-merge-default.t	Mon Jun 26 09:18:55 2017 +0900
@@ -57,8 +57,7 @@
     "dirty": "+",
     "id": "f25cbe84d8b3+2d95304fed5d+",
     "node": "ffffffffffffffffffffffffffffffffffffffff",
-    "p1": [{"node": "f25cbe84d8b320e298e7703f18a25a3959518c23", "rev": 4}],
-    "p2": [{"node": "2d95304fed5d89bc9d70b2a0d02f0d567469c3ab", "rev": 2}],
+    "parents": [{"node": "f25cbe84d8b320e298e7703f18a25a3959518c23", "rev": 4}, {"node": "2d95304fed5d89bc9d70b2a0d02f0d567469c3ab", "rev": 2}],
     "tags": ["tip"]
    }
   ]