##// END OF EJS Templates
merge: move initialization of copy dicts to one place...
Martin von Zweigbergk -
r44659:4c90001a default draft
parent child Browse files
Show More
@@ -1256,14 +1256,13 b' def manifestmerge('
1256 if matcher is not None and matcher.always():
1256 if matcher is not None and matcher.always():
1257 matcher = None
1257 matcher = None
1258
1258
1259 copy, movewithdir, diverge, renamedelete, dirmove = {}, {}, {}, {}, {}
1260
1261 # manifests fetched in order are going to be faster, so prime the caches
1259 # manifests fetched in order are going to be faster, so prime the caches
1262 [
1260 [
1263 x.manifest()
1261 x.manifest()
1264 for x in sorted(wctx.parents() + [p2, pa], key=scmutil.intrev)
1262 for x in sorted(wctx.parents() + [p2, pa], key=scmutil.intrev)
1265 ]
1263 ]
1266
1264
1265 copy, movewithdir, diverge, renamedelete, dirmove = {}, {}, {}, {}, {}
1267 if followcopies:
1266 if followcopies:
1268 ret = copies.mergecopies(repo, wctx, p2, pa)
1267 ret = copies.mergecopies(repo, wctx, p2, pa)
1269 copy, movewithdir, diverge, renamedelete, dirmove = ret
1268 copy, movewithdir, diverge, renamedelete, dirmove = ret
General Comments 0
You need to be logged in to leave comments. Login now