Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
summary: fix type of empty unresolved list
authorYuya Nishihara <yuya@tcha.org>
Fri, 07 Jul 2017 23:13:04 +0900
changeset 33413 a339027902c4
parent 33412 a42369e04aee
child 33414 16ed67164002
summary: fix type of empty unresolved list It was okay because tested as a boolean prior to calling len(), but looked incorrect.
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Fri Jul 07 23:40:00 2017 +0900
+++ b/mercurial/commands.py	Fri Jul 07 23:13:04 2017 +0900
@@ -4773,7 +4773,7 @@
         s = ' '.join(e.recordtypes)
         ui.warn(
             _('warning: merge state has unsupported record types: %s\n') % s)
-        unresolved = 0
+        unresolved = []
     else:
         unresolved = list(ms.unresolved())
mercurial