[PATCH 2 of 2 stable v2] graft: fix graft across merges of duplicates of grafted changes

Yuya Nishihara yuya at tcha.org
Fri May 12 10:20:58 EDT 2017


On Thu, 11 May 2017 17:20:35 +0200, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1494515920 -7200
> #      Thu May 11 17:18:40 2017 +0200
> # Branch stable
> # Node ID cf6482170698ea9cd590f6e72745348bef5703b4
> # Parent  6710017995b4e8b361d6ad5b897ff7d0cc658285
> graft: fix graft across merges of duplicates of grafted changes

> -        for rev in repo.changelog.findmissingrevs(revs, [crev]):
> +        # The only changesets we can be sure doesn't contain grafts of any
> +        # revs, are the ones that are common ancestors of *all* revs:
> +        for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):

Makes sense per your investigation in the previous version.
Queued these, thanks.


More information about the Mercurial-devel mailing list