[SciPy-dev] Git-svn sub-optimality
Mon Mar 9 13:46:34 CDT 2009
Mon, 09 Mar 2009 16:23:24 +0900, David Cournapeau wrote:
>> It doesn't occur if you stick to the usual git-svn workflow of getting
>> SVN commits via `git svn fetch/rebase` only. An example where it occurs
>> git fetch mirror # fetch branch from mirror or from someone
>> else git rebase svn/trunk # rebase on it git svn dcommit -n #
>> now try to dcommit
> Ah, yes, you should definitely stick to one and only one mirror. That's
> a git-svn limitation I think.
This is a different issue, I believe: the commits are exactly the same,
hashes match etc., but git-svn's caching just gets confused.
> If I look at my git-svn import and yours, the commit sha1 are not the
> same for the corresponding svn revision. As such, I don't see how it is
> possible to guarantee consistency with multiple mirrors.
This is because in your history, git-svn has made one of the preceding
commits a merge commit in `git svn rebase`. This information can't of
course be reconstructed from SVN.
More information about the Scipy-dev