Mercurial > public > mercurial-scm > hg-stable

diff tests/test-update-branches.t @ 43945:07ebb567e8bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
status: make unresolved files always be in the morestatus structured output We don't know the status of those files, only that they're unresolved, so we don't output the status for those - any code parsing this will have to be tolerant to that. Differential Revision: https://phab.mercurial-scm.org/D7668
author Rodrigo Damazio Bovendorp <rdamazio@google.com>
date Wed, 18 Dec 2019 23:45:11 -0800
parents 489fdf27769c
children ab632e27f296
line wrap: on
line diff
--- a/tests/test-update-branches.t	Wed Dec 18 23:43:21 2019 -0800
+++ b/tests/test-update-branches.t	Wed Dec 18 23:45:11 2019 -0800
@@ -591,6 +591,11 @@
     "itemtype": "file",
     "path": "foo",
     "status": "M"
+   },
+   {
+    "itemtype": "file",
+    "path": "a",
+    "unresolved": true
    }
   ]