[Python-Dev] Backport troubles with mercurial

[Amaury Forgeot d'Arc]

2010/12/29 Georg Brandl <g.brandl at gmx.net>:
>>> A change can of course also be transplanted after the fact.  It requires another
>>> merge, but usually a trivial one.
>>
>> No, it's not trivial with hg: this is the very subject of the thread!
>
> I don't understand: if you make the same change in two branches, but
> in different changesets, and then merge these branches, Mercurial will
> usually notice that and not trouble you with conflicts.

Actually I never passed the first step: make the same change to two branches.

-- 
Amaury Forgeot d'Arc