1262 for x in sorted(wctx.parents() + [p2, pa], key=scmutil.intrev) |
1262 for x in sorted(wctx.parents() + [p2, pa], key=scmutil.intrev) |
1263 ] |
1263 ] |
1264 |
1264 |
1265 copy, movewithdir, diverge, renamedelete, dirmove = {}, {}, {}, {}, {} |
1265 copy, movewithdir, diverge, renamedelete, dirmove = {}, {}, {}, {}, {} |
1266 if followcopies: |
1266 if followcopies: |
1267 ret = copies.mergecopies(repo, wctx, p2, pa) |
1267 branch_copies, diverge = copies.mergecopies(repo, wctx, p2, pa) |
1268 copy, movewithdir, diverge, renamedelete, dirmove = ret |
1268 copy = branch_copies.copy |
|
1269 renamedelete = branch_copies.renamedelete |
|
1270 dirmove = branch_copies.dirmove |
|
1271 movewithdir = branch_copies.movewithdir |
1269 |
1272 |
1270 boolbm = pycompat.bytestr(bool(branchmerge)) |
1273 boolbm = pycompat.bytestr(bool(branchmerge)) |
1271 boolf = pycompat.bytestr(bool(force)) |
1274 boolf = pycompat.bytestr(bool(force)) |
1272 boolm = pycompat.bytestr(bool(matcher)) |
1275 boolm = pycompat.bytestr(bool(matcher)) |
1273 repo.ui.note(_(b"resolving manifests\n")) |
1276 repo.ui.note(_(b"resolving manifests\n")) |