On 8/31/07, Guido van Rossum <[EMAIL PROTECTED]> wrote: > > I haven't heard yet that merging is impossible or useless; there's > still a lot of similarity between the trunk and the branch.
Merging is sometimes hard, but always fun. Well, challenging. A Chinese kind of interesting time. It certainly forces the merger to keep up to date on changes in both branches :-) I'll happily keep on merging until at least 3.0final is released, quite possibly until 2.x is nailed to its perch. I wouldn't even mind doing that after the reindent of the py3k C source; everything would conflict, but 'diff -cbB' solves that nicely. -- Thomas Wouters <[EMAIL PROTECTED]> Hi! I'm a .signature virus! copy me into your .signature file to help me spread!
_______________________________________________ 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
