Re: [Bf-committers] Farsthary's branch update help
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
Re: [Bf-committers] Farsthary's branch update help
On Tue, Nov 2, 2010 at 10:16 AM, Kent Mein m...@cs.umn.edu wrote: On Nov 2, 2010, at 8:18 AM, ra...@info.upr.edu.cu wrote: Hi Luke If all else fails I suppose someone could try mailing you a dvd with the latest repository on it :) I would offer to do so now but alas i'm doing exams and don't have much time. 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. Cheers Farsthary I'm not an svn expert, I think all you want to do is svn delete your directory and then use svn copy to rebranch. http://ubc.fay.ar.us/pub/subversion/Book/ch04s07.html has a good description. Kent No, no, don't do that... If all you have is a couple commits (which I believe is the case) then just do something like 'svn diff -c 32820 tmp.diff patch -p0 -R tmp.diff' for each commit you made, sync with trunk and then merge your (I'm guessing new) changes back in to the branch. Probably not all on one commit I'd imagine too. All this branch deleting and re-branching (which was quite popular during GSOC) kicks the crap out of my git mirror where it takes about a day or so to do a 'git svn fetch' on a new branch as opposed to less than a minute for a big branch sync commit. Or, it'd probably be super easy to sync the branch using git and then commit it to the svn repo since git merge tools don't actually completely suck like svn. Either way re-branching is bad. Dan ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
Re: [Bf-committers] Farsthary's branch update help
If all else fails I suppose someone could try mailing you a dvd with the latest repository on it :) I would offer to do so now but alas i'm doing exams and don't have much time. On 11/2/10, ra...@info.upr.edu.cu ra...@info.upr.edu.cu wrote: Hi all :) Since my branch has became pretty obsolete and was based on my first unlimited clay draft in order to commit my latest Unlimited Clay patch I need to flush the old code and start from a fresh sync source what steps should I follow to do that? (flush the old branch and start with fresh updated code) and in case I don't have the bandwith to do that could someone help me on that? Committing my patch would not be a problem since it is only few kb but re-syncing my branch I don't know... Thanks in advance and all the best Farsthary ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers -- Sent from my mobile device From Luke ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
