Hi, I mistakenly interrupted a git-svn dcommit, and now whenever I run git-svn dcommit I get a segmentation fault, but the commit is successful. I have just switched from Subversion to Git, so I'm not sure what to do (and probably using Git in a clumsy way). How I caused the problem: $ git commit -m "msg" path/to/file Created commit bee0414: msg 1 files changed, 6 insertions(+), 0 deletions(-) $ git-svn dcommit Committing to https://svn/repository ... M path/to/file Committed r8041 # ** Interruption with ctrl-c happened right at this point ** git diff still showed the change on my machine, so I ran git-svn dcommit again: $ git-svn dcommit Committing to https://svn/repository ... Merge conflict during commit: Your file or directory 'path/to/file' is probably out-of-date: The version resource does not correspond to the resource within the transaction. Either the requested version resource is out of date (needs to be updated), or the requested version resource is newer than the transaction root (restart the commit). at /usr/bin/git-svn line 420 Checking the SVN repository itself, I found the commit was actually successful (in that it appears as normal in the SVN respository). I deleted my copy of the file, ran 'git-svn rebase', and then used 'git checkout path/to/file. This gave me seemingly the correct version (i.e. with the updates). This would all be ok, except that now, whenever I git-svn dcommit anything, this happens: $ git-svn dcommit Committing to https://svn/repository ... M path/to/different/file Committed r8044 Segmentation fault The commit is successful (i.e. appears in the SVN repository). Can anyone suggest what I should do? I still have a full transcript of the session in case that will help. I'm using Ubuntu 6.06 LTS. My versions of git, git-svn, and svn (all from Ubuntu packages): $ git --version git version 1.5.3.6 $ git-svn --version git-svn version 1.5.3.6 (svn 1.3.2) Thanks very much for any help, Chris - 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
