[Bf-committers] Farsthary's branch update help

[Dan Eicher]

On Tue, Nov 2, 2010 at 10:16 AM, Kent Mein <mein at cs.umn.edu> wrote:

>
> On Nov 2, 2010, at 8:18 AM, raulf at 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