Update 2013: More recent git versions authorize using merge with strategy recursive and strategy option (-X): from “Git Merge and Fixing Mixed Spaces and Tabs with two Branches“: git merge -s recursive -Xignore-space-at-eol But using “-Xignore-space-change” is also a possibility Fab-V mentions below: git merge master -s recursive -X renormalize jakub.g also comments that the … Read more
The fundamental difference is the composition rule. In a true component-based approach, you define a configuration, that is: The list of labels (of SHA1 commits for Git) you need for your project to “work” (i.e. “develop”, “compile”, “deploy”, …). Each commit referenced in a configuration helps you to get the exact versions of all trees. … Read more
I needed this as well, and with the help of Bombe’s answer + some fiddling around, I got it working. Here’s the recipe: Import Git -> Subversion 1. cd /path/to/git/localrepo 2. svn mkdir –parents protocol:///path/to/repo/PROJECT/trunk -m “Importing git repo” 3. git svn init protocol:///path/to/repo/PROJECT -s 4. git svn fetch 5. git rebase origin/trunk 5.1. git … Read more
Lee B was right. The answer, provided by doener in #git, is to upgrade Git to 1.6.x (I had been using 1.5.x). 1.6.x offers deep cloning so that multiple wildcards can be used with the –branches option: $ git svn clone https://svn.myrepos.com/myproject web-self-serve \ –trunk=trunk –branches=branches/*/* –prefix=svn/ $ git branch -r svn/development/sandbox1 svn/development/feature1 svn/development/sandbox2 svn/development/sandbox3 … Read more
How do I migrate an SVN repository with history to a new Git repository?