Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: modify the logical statement
authorSushil khanchi <sushilkhanchi97@gmail.com>
Sun, 23 Dec 2018 13:16:25 +0530
changeset 41050 6faaf3a1c6ec
parent 41049 021496277392
child 41051 bad05a6afdc8
merge: modify the logical statement Differential Revision: https://phab.mercurial-scm.org/D5476
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Sun Dec 23 01:05:20 2018 -0500
+++ b/mercurial/merge.py	Sun Dec 23 13:16:25 2018 +0530
@@ -1538,8 +1538,8 @@
     unresolvedcount = attr.ib()
 
     def isempty(self):
-        return (not self.updatedcount and not self.mergedcount
-                and not self.removedcount and not self.unresolvedcount)
+        return not (self.updatedcount or self.mergedcount
+                    or self.removedcount or self.unresolvedcount)
 
 def emptyactions():
     """create an actions dict, to be populated and passed to applyupdates()"""
Mercurial