On 9/19/07, Facundo Batista <[EMAIL PROTECTED]> wrote: > > 2007/9/18, Thomas Wouters <[EMAIL PROTECTED]>: > > > Unfortunately, that's not how it works :-) If you check something into > the > > trunk, it will be merged into Py3k sooner or later. I may ask the > original > > submitter for assistance if it's incredibly hard to figure out the > changes, > > but so far, I only had to do that with the SSL changes. The decimal > changes > > are being merged as I write this (tests running now.) Is there anything > in > > particular that needs to be done for decimal in Py3k, besides renaming > > __div__ to __truediv__? > > There isn't nothing really special to do, but my plan was because I > didn't know how the mechanism worked, ;) > > It'd be great if all the changes that I'm making to Decimal are > automatically, at some point, merged into Py3k (I guess that using the > conversion tool).
I don't usually have to use the 2to3 tool, but sometimes, yes. But at some point, both codes may start to diverge, because > Py3k-specific optimizations could be done there... but this could be > done in an year or two, ;). > > So, how is this handled? Until which moment can I expect that the > changes in the trunk are merged to Py3k? Until you hear otherwise :) You can commit py3k-specific changes to the py3k branch, the merges shouldn't lose them. (Of course, mistakes in merging are possible, which is why tests are good :) If I do base the merge on the 2to3 outpt of the trunk version, I'd be careful not to lose changes made in the branch. -- Thomas Wouters <[EMAIL PROTECTED]> Hi! I'm a .signature virus! copy me into your .signature file to help me spread!
_______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
