##// END OF EJS Templates
py3: replace dict.iterkeys() with iter(dict)...
Pulkit Goyal -
r32863:9e3733d9 default
parent child Browse files
Show More
@@ -838,7 +838,7 b' def manifestmerge(repo, wctx, p2, pa, br'
838 for copykey, copyvalue in copy.iteritems():
838 for copykey, copyvalue in copy.iteritems():
839 if copyvalue in relevantfiles:
839 if copyvalue in relevantfiles:
840 relevantfiles.add(copykey)
840 relevantfiles.add(copykey)
841 for movedirkey in movewithdir.iterkeys():
841 for movedirkey in movewithdir:
842 relevantfiles.add(movedirkey)
842 relevantfiles.add(movedirkey)
843 filesmatcher = scmutil.matchfiles(repo, relevantfiles)
843 filesmatcher = scmutil.matchfiles(repo, relevantfiles)
844 matcher = matchmod.intersectmatchers(matcher, filesmatcher)
844 matcher = matchmod.intersectmatchers(matcher, filesmatcher)
General Comments 0
You need to be logged in to leave comments. Login now