A Single Programmer's Blog

They just work. Ain’t that cool ?

 1 $ ln -s a b

 2 $ git add b

 3 $ git commit

 4 $ git svn dcommit

 5 $ cd ../svn-wc

 6 $ svn up

 7 $ svn pl -v b

 8 Properties on ‘b’:

 9   svn:special : *

10 $ ls -l

11 lrwxr-xr-x  1 francois  staff  14 29 mai 15:10 a

12 lrwxr-xr-x  1 francois  staff  14 29 mai 15:10 b -> a

Did you know symlinks were supported in Subversion since 1.1.0 ? I certainly didn’t remember.

James Bowes has a super simple git-rebase explanation: git rebase: keeping your branches current.

If you have any difficulty understanding the concept, or want an easy way to explain to someone, go ahead.

I’m just starting to use git-svn and git-rebase, and the combination rocks.

Well, it turns out somebody (probably named dmo?) did all the hard work: Multiple branches using git-svn

If you’re like me, you need to track multiple branches in the same Git repository. I’m going to use this extensively in the XLsuite repository. I have 2 trunks/mainlines: one for the closed source, and one for the open sourced version, I also have a stable version, and some work in progress branches.