Mercurial > hg
changeset 39736:e7ae31199ff9
tests: show that the structure of the more status output looks weird
Each dict should represent data of the same kind.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 15 Sep 2018 21:28:47 +0900 |
| parents | c0c703861b60 |
| children | fd805a44b89d |
| files | tests/test-conflict.t |
| diffstat | 1 files changed, 16 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-conflict.t Sat Sep 15 16:35:39 2018 +0900 +++ b/tests/test-conflict.t Sat Sep 15 21:28:47 2018 +0900 @@ -60,6 +60,22 @@ # To continue: hg commit # To abort: hg merge --abort + $ hg status -Tjson + [ + { + "path": "a", + "status": "M" + }, + { + "path": "a.orig", + "status": "?" + }, + { + "conflictsmsg": "# Unresolved merge conflicts:\n# \n# a\n# \n# To mark files as resolved: hg resolve --mark FILE\n", + "helpmsg": "# To continue: hg commit\n# To abort: hg merge --abort\n", + "statemsg": "# The repository is in an unfinished *merge* state.\n" + } + ] $ cat a Small Mathematical Series.