[Python-3000] Merging between trunk and py3k? (original) (raw)

Thomas Wouters thomas at python.org
Tue Sep 4 01:33:33 CEST 2007

On 8/31/07, Guido van Rossum <guido at python.org> 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 <thomas at python.org>

Hi! I'm a .signature virus! copy me into your .signature file to help me spread! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.python.org/pipermail/python-3000/attachments/20070904/603706c9/attachment.htm

More information about the Python-3000 mailing list