[Python-Dev] Merging flow

[Christian Heimes]

Nick Coghlan wrote:
> I think we're discovering the real reasons why people generally prefer
> to use a DVCS when trying to manage multiple branches :P
> 
> For now it looks like we might have to maintain 3.0 manually, with
> svnmerge only helping out for trunk->2.6 and trunk->py3k...

The problem seems to be trunk -> py3k -> 3.0. I had no issues with py3k 
-> 3.0.

Christian