I haven't heard yet that merging is impossible or useless; there's still a lot of similarity between the trunk and the branch.
As long that remains the case, I'd like to continue to do merges (except for those files that have been completely rewritten or removed, like README, bufferobject.* or intobject.*). Once we stop merging, I'd like to reformat all C code to conform to the new coding standard (4-space indents, no tabs, no trailing whitespace, 80-col line length strictly enforced). But I expect that'll be a long time in the future. --Guido On 8/31/07, Thomas Heller <[EMAIL PROTECTED]> wrote: > Will commits still be merged between trunk and py3k in the future > (after the 3.0a1 release), or must this now be down by the developers > themselves? > > Or is it less work for the one who does the merge if applicable bug fixes are > comitted to both trunk and py3k branch? > > Thomas > > _______________________________________________ > Python-3000 mailing list > Python-3000@python.org > http://mail.python.org/mailman/listinfo/python-3000 > Unsubscribe: > http://mail.python.org/mailman/options/python-3000/guido%40python.org > -- --Guido van Rossum (home page: http://www.python.org/~guido/) _______________________________________________ Python-3000 mailing list Python-3000@python.org http://mail.python.org/mailman/listinfo/python-3000 Unsubscribe: http://mail.python.org/mailman/options/python-3000/archive%40mail-archive.com
