##// END OF EJS Templates
merge: modify the logical statement...
Sushil khanchi -
r41080:6faaf3a1 default
parent child Browse files
Show More
@@ -1538,8 +1538,8 b' class updateresult(object):'
1538 unresolvedcount = attr.ib()
1538 unresolvedcount = attr.ib()
1539
1539
1540 def isempty(self):
1540 def isempty(self):
1541 return (not self.updatedcount and not self.mergedcount
1541 return not (self.updatedcount or self.mergedcount
1542 and not self.removedcount and not self.unresolvedcount)
1542 or self.removedcount or self.unresolvedcount)
1543
1543
1544 def emptyactions():
1544 def emptyactions():
1545 """create an actions dict, to be populated and passed to applyupdates()"""
1545 """create an actions dict, to be populated and passed to applyupdates()"""
General Comments 0
You need to be logged in to leave comments. Login now