Kees-Jan Dijkzeul wrote:
Basically, the problem is as follows: My head commit is a merge:
$ git show HEAD
commit e135f26dbae66f539b486646a12aa51e71c196a1
Merge: bb8ac98... f453e1e...
Both parents are svn-commits.
That seems to be a case that the current merge support in git-svn can't
handle. I'll refer you to the test I did when the merge support first
landed on the mailing list:
http://www.spinics.net/lists/git/msg33628.html
The current code seems to be aimed at using branches for local
development on the git side rather than dealing with relationships
between multiple svn branches.
I'll also point out this utility, which may be of use to you. It is not
perfect but it works.
http://www.spinics.net/lists/git/msg29119.html
-Steve
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
