tests/test-merge-default.t
changeset 39641 10c5eacd793f
parent 33101 9e0d222f5687
child 39642 6ecfd12f09cd
equal deleted inserted replaced
39640:713085b45810 39641:10c5eacd793f
    53   [
    53   [
    54    {
    54    {
    55     "bookmarks": [],
    55     "bookmarks": [],
    56     "branch": "default",
    56     "branch": "default",
    57     "dirty": "+",
    57     "dirty": "+",
    58     "id": "f25cbe84d8b3+2d95304fed5d+",
    58     "id": "f25cbe84d8b320e298e7703f18a25a3959518c23+2d95304fed5d89bc9d70b2a0d02f0d567469c3ab+",
    59     "node": "ffffffffffffffffffffffffffffffffffffffff",
    59     "node": "ffffffffffffffffffffffffffffffffffffffff",
    60     "parents": [{"node": "f25cbe84d8b320e298e7703f18a25a3959518c23", "rev": 4}, {"node": "2d95304fed5d89bc9d70b2a0d02f0d567469c3ab", "rev": 2}],
    60     "parents": [{"node": "f25cbe84d8b320e298e7703f18a25a3959518c23", "rev": 4}, {"node": "2d95304fed5d89bc9d70b2a0d02f0d567469c3ab", "rev": 2}],
    61     "tags": ["tip"]
    61     "tags": ["tip"]
    62    }
    62    }
    63   ]
    63   ]
    80   $ hg id -r 1 -Tjson
    80   $ hg id -r 1 -Tjson
    81   [
    81   [
    82    {
    82    {
    83     "bookmarks": [],
    83     "bookmarks": [],
    84     "branch": "default",
    84     "branch": "default",
    85     "id": "1846eede8b68",
    85     "id": "1846eede8b6886d8cc8a88c96a687b7fe8f3b9d1",
    86     "node": "1846eede8b6886d8cc8a88c96a687b7fe8f3b9d1",
    86     "node": "1846eede8b6886d8cc8a88c96a687b7fe8f3b9d1",
    87     "tags": []
    87     "tags": []
    88    }
    88    }
    89   ]
    89   ]
    90 
    90