Hey, I had exactly the same problem last summer! What I did then in the end is merging by hand when I was allowed to merge my branch to trunk. That wasn't too much a problem as most files were new and in a separate directory (audaspace).
Since then I'm poking Ton to update the svn server, because a new version as you said resolves the problem. I hope this other case helps speeding up this a little. Regards, Jörg Am 30.07.2010 08:07 schrieb "Mitchell Stokes" <[email protected]>: Hello devs, I'm looking for a bit of advice. A couple of days ago, my mentor and I realized that some of the merges earlier in the project were done poorly, which is now starting to cause some issues. I'm thinking the best way to resolve this is to diff against the trunk and clean up the resulting diff to only have my changes. Then, from there, rebranch from trunk and apply the diff to the new branch. Thoughts on this? Also, another thing to consider: I believe newer versions of SVN are much better at merging. For example, I don't think a revision range needs to be specified (this is where problems showed up in my branch). I know there was some talk about upgrading to a newer version of Subversion (1.4.3 is quite ancient). Is anything happening to this end? Thank you, Mitchell Stokes (Moguri) _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
