[Python-Dev] No time for svn merge
facundobatista at gmail.com
Mon Mar 31 14:38:27 CEST 2008
2008/3/31, Christian Heimes <lists at cheimes.de>:
> In most cases it's easy. Usually it takes me less than 20 minutes per
> day to merge the chances from trunk -> py3k. In this particular case
> several obstacles come together. The changes in the AST and parser code
> aren't trivial, I'm not familiar with the internals of the AST and
> parser code and my free time is very limited.
> Please don't patch trunk and py3k simultaneously. It may confuse svn and
> may make future merges harder. You should apply the patch to the trunk
> and either merge or block the revision with svnmerge.
Mmmm... so, I'll do this. I'll just commit on the trunk, but know
people that I'm here if you need to ask anything about commited stuff
or whatever ("here" means through IM, and normally hanging around in
#python-dev or #pyar in freenode).
More information about the Python-Dev