hgext/rebase.py

44094:521b4e3a42d7

        repo.dirstate.write(repo.currenttransaction())
    ctx = repo[rev]
    repo.ui.debug(b" merge against %d:%s\n" % (rev, ctx))
    if base is not None:
        repo.ui.debug(b"   detach base %d:%s\n" % (base, repo[base]))
    # When collapsing in-place, the parent is the common ancestor, we
    # have to allow merging with it.
    stats = mergemod.update(
        repo,
        rev,
        branchmerge=True,
        force=True,
        ancestor=base,
        mergeancestor=collapse,
        labels=[b'dest', b'source'],
        wc=wctx,
    )
    if collapse:
        copies.graftcopies(wctx, ctx, repo[dest])

44095:e733c59f3c09

        repo.dirstate.write(repo.currenttransaction())
    ctx = repo[rev]
    repo.ui.debug(b" merge against %d:%s\n" % (rev, ctx))
    if base is not None:
        repo.ui.debug(b"   detach base %d:%s\n" % (base, repo[base]))

    # See explanation in merge.graft()
    mergeancestor = repo.changelog.isancestor(p1ctx.node(), ctx.node())
    stats = mergemod.update(
        repo,
        rev,
        branchmerge=True,
        force=True,
        ancestor=base,
        mergeancestor=mergeancestor,
        labels=[b'dest', b'source'],
        wc=wctx,
    )
    if collapse:
        copies.graftcopies(wctx, ctx, repo[dest])