<br><br><div><span class="gmail_quote">On 9/4/07, <b class="gmail_sendername">Nicholas Bastin</b> <<a href="mailto:firstname.lastname@example.org">email@example.com</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;">
On 9/3/07, Thomas Wouters <<a href="mailto:firstname.lastname@example.org">email@example.com</a>> wrote:<br>><br>><br>> On 8/31/07, Guido van Rossum <<a href="mailto:firstname.lastname@example.org">email@example.com</a>> wrote:<br>
> > 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.<br>><br>> Merging is sometimes hard, but always fun. Well, challenging. A Chinese kind
<br>> of interesting time.<br><br>Merging in SVN is hard and challenging. Merging in a reasonable SCM<br>is not so bad. :-)</blockquote><div><br> 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.
<br></div></div><br>-- <br>Thomas Wouters <<a href="mailto:firstname.lastname@example.org">email@example.com</a>><br><br>Hi! I'm a .signature virus! copy me into your .signature file to help me spread!