Hi all :) thanks for the answers I'm using TortoiseSVN so no command line I think, If I use the Merge command it won't mess things with the trunk? I thougth merging affect the trunk...
> Hi All, > >>What I was saying is that I need to clean up my branch on Blender SVN >>repository and start clean there, I could sync once in a while here >>because changes are sub 1mb. >>If any admin could help me with that i will be very thankfull for that, >>once updated and cleaned the code I could commit my latest changes. > > > > so looks like if > > merge all changes from the trunck to the branch then resolve all conflicts > with > > svn resolve path --accept theirs-full > > Or, it is possible to tell the merge to do that: > > svn merge -rX:HEAD > https://svn.blender.org/svnroot/bf-blender/trunk/blender > https://svn.blender.org/svnroot/bf-blender/branches/branch-farsthary > --ignore-ancestry --accept theirs-full > > then after such a merge, there will be a working copy which looks > like the one the trunk. then all admin have to do is commit that > trunk working copy. > > > that way Farshary will have a clean branch without deletion. > > anyone with svn access will check correctness and perform operations? > > Regards > Sergey > _______________________________________________ > Bf-committers mailing list > Bf-committers@blender.org > http://lists.blender.org/mailman/listinfo/bf-committers > _______________________________________________ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers