-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 03/02/11 13:04, Nick Coghlan wrote: > On Thu, Feb 3, 2011 at 10:37 AM, Jesus Cea <j...@jcea.es> wrote: >> In fact, "up-porting" is usually better, because you don't have to think >> if you must downport or not. Versión "n+1" is always a superset of >> versión "n". So you "up-port" *ALWAYS*, automatically (mostly) via merge. > > As I said, I'm happy to roll with the proposed workflow as documented > in the PEP, based on the advice from experts that Mercurial doesn't > really suit our current work flow. I'm just noting that I expect the > result will be fewer fixes in maintenance branches, since it is harder > to divide the tasks of implementing a fix for the main line of > development and applying that fix to the maintenance branches (unlike > the way it often happens now).
The problem now is that patches in the development branch are "forgotten" and not backported when appropiate, and nobody cares about "blocking" versions to "not backport". Now running "svnmerge" to do a real merge is very risky, because the "blocking" is not actually maintained. People uses "svnmerge" backporting patch by patch, manually. Automatic mode is a disaster, because nobody cares about "blocking" in "svnmerge". If we up-port, no patch is forgotten. The rule should be: "patches in n+1 are a SUPERSET of patches in n". With this rule, mercurial takes care of everything (a patch in n+1 can 'undo' a patch up-ported from n, if needed, keeping the rule). > The worse possibility is that fixes may be applied to maintenance > branches and not to the main line of development, leading to > regressions after upgrades (since the associated tests wouldn't be > forward ported either). That is not going to happen, because the mercurial merging between maintenance and development. This is the up-porting side, and merging should be automatic, you don't need to track anything, it is automagically done by mercurial. - -- Jesus Cea Avion _/_/ _/_/_/ _/_/_/ j...@jcea.es - http://www.jcea.es/ _/_/ _/_/ _/_/ _/_/ _/_/ jabber / xmpp:j...@jabber.org _/_/ _/_/ _/_/_/_/_/ . _/_/ _/_/ _/_/ _/_/ _/_/ "Things are not so easy" _/_/ _/_/ _/_/ _/_/ _/_/ _/_/ "My name is Dump, Core Dump" _/_/_/ _/_/_/ _/_/ _/_/ "El amor es poner tu felicidad en la felicidad de otro" - Leibniz -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQCVAwUBTUtuJ5lgi5GaxT1NAQL9OwP/ScnQ6Ahcgqdu73H01VGe4XPeJv8mDGss DokVIB/UrqnhtdeE+ky1uWTVSvcdcsClWsLMHPtW1KyTqWuf83fT9J1UWdXm5ol9 +QR1I8Vgot/WYt0XJ4ktP8VbN3SsUJoT+cJfEdGYI9I3Cc5UrXVOuOwpioANjyvE 5EBgj6ro1QY= =slHU -----END PGP SIGNATURE----- _______________________________________________ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
