{"thread":{"id":"26121","subject":"Network problems during \"git svn dcommit\": need help!","startedAt":"2010-12-22T11:50:08Z","lastAt":"2010-12-27T00:57:39Z","messageCount":2,"participants":["Josef Wolf","Jonathan Nieder"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"158484","messageId":"20101222115008.GA10765@raven.wolf.lan","threadId":"26121","inReplyTo":null,"subject":"Network problems during \"git svn dcommit\": need help!","fromName":"Josef Wolf","fromEmail":"jw@raven.inka.de","sentAt":"2010-12-22T11:50:08Z","receivedAt":"2010-12-22T11:50:08Z","isPatch":false,"sender":{"key":"jw@raven.inka.de","avatar":null},"body":"Hello,\n\nI am using git-svn to track a subversion repository. This used to work\nfine so far. But today, I got a network outage during a \"git svn dcommit\"\noperation. I can see with gitk, that not all of my commits made it to\nthe svn repositoy. I tried \"git svn rebase\" and \"git svn dcommit\" to\nresume, but they act as if I had no local commits.\n\nAny hints how to fix the situation?\n"},{"id":"158605","messageId":"20101227005739.GA32713@burratino","threadId":"26121","inReplyTo":"20101222115008.GA10765@raven.wolf.lan","subject":"Re: Network problems during \"git svn dcommit\"","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-12-27T00:57:39Z","receivedAt":"2010-12-27T00:57:39Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Josef Wolf wrote:\n\n> I am using git-svn to track a subversion repository. This used to work\n> fine so far. But today, I got a network outage during a \"git svn dcommit\"\n> operation.\n[...]\n> Any hints how to fix the situation?\n\nYes.\n\nTo fix your repository:\n 1. make backups!\n 2. back out the bad commit so it is not visible with \"gitk --all\"\n    (something like\n\n\tgit reset --keep HEAD^\n\tgit push . HEAD:refs/remotes/svn/Trunk\n\n    )\n 3. \"rm -fr .git/svn/\".  Note: this will delete your unhandled.log!\n    Restore it from backup if you consider it precious.\n 4. \"git svn fetch; git svn rebase\"\n\nTo fix \"git svn\", see [1].\n\nHope that helps,\nJonathan\n\n[1] http://thread.gmane.org/gmane.comp.version-control.git/136510\n"}]}