Changes between Version 11 and Version 12 of git-svn-tutorial

Timestamp:

08/08/09 09:23:34 (12 years ago)

Author:

bacek

Comment:

Tracking svn branches

git-svn-tutorial

@@ -109 +109 @@
 Other developers may access your local branches, but in order to do so, they would need to be able to access your git repository.
 
+== Tracking SVN branches with GIT ==
+
+Start svn branch in git.
+{{{
+    git svn branch -m "Branch for work on extra cool feature" extra_cool_feature
+    git checkout extra_cool_feature_local remotes/extra_cool_feature # to avoid warning from git about ambiguity
+    ... hack/git commit/git commit --amend/git rebase -i HEAD~10/... as usual
+}}}
+
+dcommit to svn
+{{{
+    git svn dcommit --dry-run # check that it will commit to proper svn branch.
+    git svn dcommit
+}}}
+
+Merging trunk into branch
+{{{
+    git checkout master
+    git svn rebase
+    git checkout extra_cool_branch
+    git merge --squash master
+    git commit -m "Bring branch up-to-date with trunk" 
+}}}
+
+Merging branch back to trunk
+{{{
+    git checkout master
+    git svn rebase
+    git merge --squash extra_cool_feature
+    git commit -m "Merge branch into trunk" 
+}}}
+
+Hints and caveats:
+
+ 1. Don't try to rebase already dcommited changes. They are not belong to you anymore.
+ 
+ 2. Always run "git svn dcommit --dry-run" before real commit to check in which branch your changes will be committed.
+ 
+ 3. Always merge branches with "--squash". Otherwise git-svn will do it for you and can epicly fail sometime.
+
+ 4. svn isn't smart enough to track merges. So, don't try to merge branches with pure svn and git-svn on same branch.
+
+     
+
 == Ignoring generated files ==