<div dir="ltr">Thanks for the instructions. I managed to get set up with git-svn and my branch.<div><br></div><div>I don't think it's necessary to set up the branch to track the svn-remote branch (no --track needed in step 3). git-svn doesn't use the tracking configuration for anything, it just remembers the "SVN parent" for a branch. Instead, I have my local branch tracking a remote github branch, so I can push my activity to github: <a href="https://github.com/sftrabbit/Blender-GSoC-2013-Motion-Track">https://github.com/sftrabbit/Blender-GSoC-2013-Motion-Track</a></div>
<div><br></div><div>So my .git/config looks like this (exc. [core]):</div><div><br></div><div><div>[svn-remote "svn"]</div><div><span class="" style="white-space:pre"> </span>url = <a href="https://svn.blender.org/svnroot/bf-blender/trunk/blender">https://svn.blender.org/svnroot/bf-blender/trunk/blender</a></div>
<div><span class="" style="white-space:pre"> </span>fetch = :refs/remotes/git-svn</div><div>[svn-remote "motion_track"]</div><div><span style="white-space:pre"> </span>url = <a href="https://svn.blender.org/svnroot/bf-blender/branches/soc-2013-motion_track">https://svn.blender.org/svnroot/bf-blender/branches/soc-2013-motion_track</a></div>
<div><span class="" style="white-space:pre"> </span>fetch = :refs/remotes/git-svn-motion_track</div><div>[remote "github"]</div><div><span class="" style="white-space:pre"> </span>url = git@github.com:sftrabbit/Blender-GSoC-2013-Motion-Track.git</div>
<div><span class="" style="white-space:pre"> </span>fetch = +refs/heads/*:refs/remotes/github/*</div><div>[branch "motion_track"]</div><div><span class="" style="white-space:pre"> </span>remote = github</div><div>
<span class="" style="white-space:pre"> </span>merge = refs/heads/motion_track</div></div><div><br></div><div>Now `git svn fetch` and `git svn rebase` on the local motion_track branch will work with the motion_track svn-remote and `git push`, `git fetch`, etc. will work with the github remote.</div>
<div><br></div><div>I've not used git-svn before so if you notice any problems with this, please let me know.</div><div><br></div><div>Thanks,</div><div>Joe</div><div class="gmail_extra"><br><div class="gmail_quote">
On 13 June 2013 19:17, Dalai Felinto <span dir="ltr"><<a href="mailto:dfelinto@gmail.com" target="_blank">dfelinto@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">As per request, I updated my own git-svn instructions to include how<br>
to deal with branches:<br>
<a href="http://wiki.blender.org/index.php?title=User:Dfelinto#Git_svn_branch" target="_blank">http://wiki.blender.org/index.php?title=User:Dfelinto#Git_svn_branch</a><br>
<br>
So instead of git svn clone the branch directly, you can still git svn<br>
clone trunk, and have your branch checkout as well. This helps to git<br>
diff the branch against master (for code cleanup/review).<br>
<br>
Perhaps it even help to merge from the master to the branch via git.<br>
Though that may mess up svn merge meta-info once you git svn dcommit<br>
your branch work to trunk.<br>
<br>
Have fun,<br>
Dalai<br>
<div class=""><div class="h5">_______________________________________________<br>
Bf-committers mailing list<br>
<a href="mailto:Bf-committers@blender.org">Bf-committers@blender.org</a><br>
<a href="http://lists.blender.org/mailman/listinfo/bf-committers" target="_blank">http://lists.blender.org/mailman/listinfo/bf-committers</a><br>
</div></div></blockquote></div><br></div></div>