##// END OF EJS Templates
merge: use any() instead of for loop when checking for dirty subrepos...
Martin von Zweigbergk -
r28226:377f0d8f default
parent child Browse files
Show More
@@ -801,10 +801,8 b' def manifestmerge(repo, wctx, p2, pa, br'
801
801
802 if '.hgsubstate' in m1:
802 if '.hgsubstate' in m1:
803 # check whether sub state is modified
803 # check whether sub state is modified
804 for s in sorted(wctx.substate):
804 if any(wctx.sub(s).dirty() for s in wctx.substate):
805 if wctx.sub(s).dirty():
805 m1['.hgsubstate'] += '+'
806 m1['.hgsubstate'] += '+'
807 break
808
806
809 # Compare manifests
807 # Compare manifests
810 if matcher is not None:
808 if matcher is not None:
General Comments 0
You need to be logged in to leave comments. Login now