[Python-3000] Merging between trunk and py3k?

[Thomas Wouters]

On 9/4/07, Nicholas Bastin <nick.bastin at gmail.com> wrote:
>
> 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.  :-)


 Merging two direct sibling branches with svnmerge is actually quite doable.
It's slightly more annoying than it would be in an SCM with proper branch
merging, but not significantly so. The merges we're doing would be about as
hard and challenging in any other SCM. I know, I actually did them.

-- 
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/5f05bb83/attachment-0001.htm