Never found a good way to do really reliable merges in svn, for some reason every so often files done get added like they should. So I wrote this script to make sure an svn branch is always in sync with another with a list of files not to overwrite,
http://wiki.blender.org/index.php/User:Ideasman42#SVN_Masked_Copy_.28script.29 Id expect an svn guru could give a better answer, but for me this worked well. On Sat, May 29, 2010 at 9:51 AM, Mitchell Stokes <[email protected]> wrote: > How would I go about resolving the merging problem? > _______________________________________________ > Bf-committers mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-committers > -- - Campbell _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
