This isn't exactly the subject of this thread but for those who are expecting a very tedious merge with trunk when their gsoc project is finished, I wrote some guidelines to merge a branch with trunk semi automatically provided that the branch is perfectly in sync with trunk:
http://lists.blender.org/pipermail/bf-committers/2009-September/024588.h tml This won't be necessary when the SVN server is updated as --reintegrate should work, but for the time being it is the fastest method I could find. /benoit On Fri, 30 Jul 2010 21:27:12 -0700, Mitchell Stokes <[email protected]> wrote: > Hello devs, > > The version of Subversion that the SVN server is using > (1.4.3) is around 4 years old and is serious need of being > updated. 1.5.x made improvements to merging and I think 1.6.x > made improvements to resolving conflicts. With the amount of > branching that Blender does (10 branches this summer from GSoC > alone) I would think that updating to a version of Subversion > that has better merging would be desired. I understand that > updating the server software can be a daunting (and often > disrupting) task, but I think doing an update once every 4 > years isn't too much to ask for. Also, while on the topic of > updating server software, what happened to the tracker updates? > > I've spent yesterday and today trying to fix merging problems > that would not be present with a newer version of Subversion, > so I'm a little annoyed right now. As such, this message > might come across as a little harsher than I intended. Please > do not take offense as none was intended. > > Cheers, > Mitchell Stokes (Moguri) _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
