<br><br><div><span class="gmail_quote">On 12/13/06, <b class="gmail_sendername">Giovanni Bajo</b> <<a href="mailto:rasky@develer.com">rasky@develer.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;">
Thomas Wouters wrote:<br><br>> Merging with svnmerge has a big consequence: changes that are applied to<br>> both the trunk and the p3yk branch are hell.<br><br>You do know you can use svnmerge merge --record-only, cherry-picking the
<br>changes that have been applied on both branches, and then use a single<br>svnmerge merge for everything else?</blockquote><div><br>Sure, but how do you tell that is has been properly applied to both branches? If they are the exact same change, it's not really a big deal unless lots of other work happened in either branch. The more common case, in p3yk, is for the changes to be subtly different (for instance, 'has_key' being replaced by 'in', in the p3yk branch, missing __future__ imports, indentation being different, etc.) You end up having to make sure there are no accidentally hidden changes in there. Either way, whether you do it by --record-only or by figuring out the result, you spend a lot of time checking individual changesets.
<br></div><br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"> > but I don't mind if someone else wants to step up and learn the<br> > intense pain that is repeated merging in Subversion.
<br><br>I can try and provide some help with that, but I'm not sure if it qualifies<br>for "stepping up". I guess we could start with some IM sessions during the<br>merges. Contact me in private for details, if you think my help can be useful.
</blockquote><div><br>I'm not sure if collaborative merging makes sense, as the problem isn't tips or tricks in merging (I've had merging down pat for years,) but figuring out the code that is being merged. I'll be sure to holler if I'm merging any code ou touched, though :) And of course if I get stuck with svnmerge.
<br></div></div><br>-- <br>Thomas Wouters <<a href="mailto:thomas@python.org">thomas@python.org</a>><br><br>Hi! I'm a .signature virus! copy me into your .signature file to help me spread!