[Soc-2013-dev] [Bf-committers] Git svn wisdom for newcomers

[Joseph Mansfield]

Thanks for the instructions. I managed to get set up with git-svn and my
branch.

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:
https://github.com/sftrabbit/Blender-GSoC-2013-Motion-Track

So my .git/config looks like this (exc. [core]):

[svn-remote "svn"]
url = https://svn.blender.org/svnroot/bf-blender/trunk/blender
 fetch = :refs/remotes/git-svn
[svn-remote "motion_track"]
url =
https://svn.blender.org/svnroot/bf-blender/branches/soc-2013-motion_track
 fetch = :refs/remotes/git-svn-motion_track
[remote "github"]
url = git at github.com:sftrabbit/Blender-GSoC-2013-Motion-Track.git
 fetch = +refs/heads/*:refs/remotes/github/*
[branch "motion_track"]
remote = github
 merge = refs/heads/motion_track

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.

I've not used git-svn before so if you notice any problems with this,
please let me know.

Thanks,
Joe

On 13 June 2013 19:17, Dalai Felinto <dfelinto at gmail.com> wrote:

> As per request, I updated my own git-svn instructions to include how
> to deal with branches:
> http://wiki.blender.org/index.php?title=User:Dfelinto#Git_svn_branch
>
> So instead of git svn clone the branch directly, you can still git svn
> clone trunk, and have your branch checkout as well. This helps to git
> diff the branch against master (for code cleanup/review).
>
> Perhaps it even help to merge from the master to the branch via git.
> Though that may mess up svn merge meta-info once you git svn dcommit
> your branch work to trunk.
>
> Have fun,
> Dalai
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.blender.org/pipermail/soc-2013-dev/attachments/20130616/44990981/attachment.htm