equal
deleted
inserted
replaced
1542 rev, |
1542 rev, |
1543 branchmerge=True, |
1543 branchmerge=True, |
1544 force=True, |
1544 force=True, |
1545 ancestor=base, |
1545 ancestor=base, |
1546 mergeancestor=mergeancestor, |
1546 mergeancestor=mergeancestor, |
1547 labels=[b'dest', b'source'], |
1547 labels=[b'dest', b'source', b'parent of source'], |
1548 wc=wctx, |
1548 wc=wctx, |
1549 ) |
1549 ) |
1550 wctx.setparents(p1ctx.node(), repo[p2].node()) |
1550 wctx.setparents(p1ctx.node(), repo[p2].node()) |
1551 if collapse: |
1551 if collapse: |
1552 copies.graftcopies(wctx, ctx, p1ctx) |
1552 copies.graftcopies(wctx, ctx, p1ctx) |