<br><br><div><span class="gmail_quote">On 8/31/07, <b class="gmail_sendername">Guido van Rossum</b> <<a href="mailto:email@example.com">firstname.lastname@example.org</a>> wrote:</span><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
I haven't heard yet that merging is impossible or useless; there's<br>still a lot of similarity between the trunk and the branch.</blockquote><div><br>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.<br>
</div></div><br>-- <br>Thomas Wouters <<a href="mailto:email@example.com">firstname.lastname@example.org</a>><br><br>Hi! I'm a .signature virus! copy me into your .signature file to help me spread!