First of all, before I state the problems I am running into, I must say that I loved git. It is easy to setup, since there is no need to initialize a server or repository, powerful, because one can branch and merge as needed something that was harder in others. And on top of everything it is very easy to follow up the history with gitk. :-) But not everything are flowers in my git-life. I have to use svn to commit upstream, in fact there are two different upstream svn servers. I tryied to maintain both coordinates using two git-svn repositories. But there are ocasions that the git-svn repository gets into a state that dcommit simply does not work anymore. :-( The problem seem to be that when I merge the head with another branch git-svn does not know where to follow to meet the "svn trunk". So what happens it that I have a head that was merged from a side track development (usually rooted on the other svn server) and then it goes to the wrong side. for instance : o master (merge commit) 17696dc402da59f8eba0dcd60f15a66859cb0c2a |\ | o remotes/trunk svn head c0691ffaa3a41c6b5c13aec5b06b64f6321efd35 | | o | mine local modifications f1494e9bb4c237253587c1ffdc150394c6813100 | | ... ... When I try to use dcommit the command fails to find the coorect path to make and send the diffs. I saw that svn-git user uses git-rev-list to make this path, but look at the list this command gives me : 17696dc402da59f8eba0dcd60f15a66859cb0c2a f1494e9bb4c237253587c1ffdc150394c6813100 c0691ffaa3a41c6b5c13aec5b06b64f6321efd35 the problem is that the last element is not a git-svn commit and the tool simply whants him to be son of a git-svn commit, this is the commit that goes "f1494e9bb4c237253587c1ffdc150394c6813100", an it is not on the last position as expected. Got searchs for metadata in the wrong place and "boom" break... I don't know how to rever into a sane state, nor how can I avoid to get into this situatiom, since I havo not yet found a clear reason on how this came to be. - 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
