[Bf-committers] HOWTO transplant development branches coming from git-svn to git.blender.org

2013-11-17 Thread Julien RIVAUD (_FrnchFrgg_)
Hi everyone, I'd like to give you notice of a somewhat advanced git HOWTO for people that used previout git mirrors of blender (as the mirror by jesterKing). The HOWTO is here: http://wiki.blender.org/index.php/User:Frnchfrgg/Transplant This HOWTO aims to salvage developement branches made wit

[Bf-committers] HOWTO transplant development branches coming from git-svn to git.blender.org

2013-11-17 Thread Julien RIVAUD (_FrnchFrgg_)
Hi everyone, I'd like to give you notice of a somewhat advanced git HOWTO for people that used previout git mirrors of blender (as the mirror by jesterKing). The HOWTO is here: http://wiki.blender.org/index.php/User:Frnchfrgg/Transplant This HOWTO aims to salvage developement branches made wit

Re: [Bf-committers] HOWTO transplant development branches coming from git-svn to git.blender.org

2013-11-17 Thread Mitchell Stokes
Here's what I did: * Create a copy of my git-svn repo to avoid messing it up (I will refer to this as copy-repo). * cd to the copied repo * Make the blender folder the root of the repot with: git filter-branch --subdirectory-filter blender/ -- --all * cd into your new Blender repo * Add your

Re: [Bf-committers] HOWTO transplant development branches coming from git-svn to git.blender.org

2013-11-17 Thread Julien RIVAUD (_FrnchFrgg_)
Le 17/11/2013 21:28, Mitchell Stokes a écrit : > * Make the blender folder the root of the repot with: git filter-branch > --subdirectory-filter blender/ -- --all I tested and in fact doing the following is (much) faster: git fast-export > ../orig.fi reposurgeon "read orig.fi; paths sup; write dest

Re: [Bf-committers] HOWTO transplant development branches coming from git-svn to git.blender.org

2013-11-17 Thread Julien RIVAUD (_FrnchFrgg_)
Le 17/11/2013 19:36, Julien RIVAUD (_FrnchFrgg_) a écrit : > Hi everyone, > > I'd like to give you notice of a somewhat advanced git HOWTO for > people that used previout git mirrors of blender (as the mirror by > jesterKing). The HOWTO is here: > http://wiki.blender.org/index.php/User:Frnchfrgg

Re: [Bf-committers] HOWTO transplant development branches coming from git-svn to git.blender.org

2013-11-18 Thread Dalai Felinto
Julien, Thanks for the crazy amount of work you put on it. Stereographers will have you in good account - even though you made it sound as if my branch was the worse user-case for branch migration, but that's fair enough since it was my first time using git for real ;) Even following the instruc

Re: [Bf-committers] HOWTO transplant development branches coming from git-svn to git.blender.org

2013-11-19 Thread Julien RIVAUD (_FrnchFrgg_)
Le 18/11/2013 17:48, Dalai Felinto a écrit : > Stereographers will have you in good account - even though you made it > sound as if my branch was the worse user-case for branch migration Not worse but hard because long-lived. Most devs probably have smaller branches that they rebased regularly. Bu