[Python-Dev] Backport troubles with mercurial (original) (raw)

Georg Brandl g.brandl at gmx.net
Wed Dec 29 11:16:44 CET 2010

Am 29.12.2010 11:09, schrieb Amaury Forgeot d'Arc:

2010/12/29 Georg Brandl <g.brandl at gmx.net>:

What worries me more is the requirement to find the correct branch before I can even edit the file. How would you, Georg, deal with doc patches (typos, bad markup)?

Finding the correct branch is not really hard. Bugfixes go to maintenance, features to trunk. This works well indeed, provided there is only one maintenance branch.

Which there is, except for security fixes (but they are rare and require release manager intervention anyway).

You need to think about which category your change is right now too, when deciding what to backport/svnmerge. No, today this decision can take place after the development, some tickets got reopened because a backport was needed.

A change can of course also be transplanted after the fact. It requires another merge, but usually a trivial one.

Of course you may have to think a bit more about bugfix before plunging into the code, but is that necessarily a bad thing? We had quite a few bugfixes not backported precisely because it is very easy not to care about them right now.

Georg

More information about the Python-Dev mailing list