[Python-Dev] Merging 3.2 to 3.3 is messy because "Misc/NEWS"

[Antoine Pitrou]

On Thu, 10 Nov 2011 12:49:48 +0900
"Stephen J. Turnbull" <stephen at xemacs.org> wrote:
> 
>  > A bit of discipline and, voila, automatic flawless merges! :-)
> 
> Doesn't work that way, sorry. The discipline required is isomorphic to
> that required by threaded programs.  See multiple threads on
> python-ideas for why that is less than automatic or flawless. :-)
> 
> Antoine's suggestion looks to be analogous to STM.

It's more like shared-nothing, actually.
(but that's not my suggestion, just a mention of how another project
deals with the issue; I find the current situation quite manageable
myself)

Regards

Antoine.