Changes between Version 15 and Version 16 of GitMirror

Timestamp:

03/07/09 17:43:14 (4 years ago)

Author:

pv

Comment:

Add warning concerning dcommit and using the mirror. Quite bad sub-optimality in git-svn.

GitMirror

@@ -167 +167 @@
 If you configured git-svn as instructed above, you can interface directly to SVN.
 
+== A (big fat) word of warning ==
+
+If you `git fetch` SVN commits to Git from the mirror (or indirectly from somewhere else), `git-svn` gets confused. This is visible eg. the next time you try to `dcommit` back to SVN: you get spurious extra commits.
+
+So every time before doing a `git svn dcommit`, it's necessary to rebuild your `git-svn` database:
+{{{
+# optional: if you don't want to actually rebase your current branch, switch to a temporary one
+git co -b commit
+
+# remove old DB and rebuild it
+rm -rf .git/svn
+git svn rebase -l
+}}}
+Another way is to always use `git svn fetch`. But then you can still run into the same problem if you fetch someone else's branch.
+
 == Committing to SVN ==
+
+First, read the above warning.
 
 Commit back to the scipy svn repository with git svn dcommit:
@@ -208 +225 @@
 git svn fetch
 }}}
-It will usually still stay compatible with the SVN mirror even if you do this. There are, however, some corner cases that may arise if you commit merge commits to SVN: then history generated by `svn fetch` may start to deviate from that in the mirror. So, using `git svn fetch` should be avoided in these cases.
+It will usually still stay compatible with the SVN mirror even if you do this. There are, however, some corner cases that may arise if you commit merge commits to SVN: then history generated by `svn fetch` may start to deviate from that in the mirror.