[Bf-committers] Farsthary's branch update help
sergey.forum at gmail.com
Wed Nov 3 16:47:23 CET 2010
>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
--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?
More information about the Bf-committers