Bug in rebase?

Peter Arrenbrecht peter.arrenbrecht at gmail.com
Wed Mar 11 14:07:57 CDT 2009


Hi Stefano

I am looking at this from rebase.py:

def rebasemerge(repo, rev, first=False):
    'return the correct ancestor'
    oldancestor = ancestor.ancestor

    def newancestor(a, b, pfunc):
        ancestor.ancestor = oldancestor
        anc = ancestor.ancestor(a, b, pfunc)
        if b == rev:

Is the above line correct, or should it read `if b == anc:`? I am
asking because right now anc is unused.

            return repo[rev].parents()[0].rev()
        return ancestor.ancestor(a, b, pfunc)

    if not first:
        ancestor.ancestor = newancestor
    else:
        repo.ui.debug(_("first revision, do not change ancestor\n"))
    stats = merge.update(repo, rev, True, True, False)
    return stats

-parren


More information about the Mercurial-devel mailing list