[Python-3000] Merging between trunk and py3k?

[Nicholas Bastin]

On 9/3/07, Thomas Wouters <thomas at python.org> wrote:
>
>
> 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.

Merging in SVN is hard and challenging.  Merging in a reasonable SCM
is not so bad.  :-)

(Unfortunately, in this context, read "reasonable" as "commercial")

--
Nick