Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 33413:a339027902c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
summary: fix type of empty unresolved list It was okay because tested as a boolean prior to calling len(), but looked incorrect.
author Yuya Nishihara <yuya@tcha.org>
date Fri, 07 Jul 2017 23:13:04 +0900
parents 4a70985805c6
children 0407a51b9d8c
line wrap: on
line diff
--- 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())