Network problems during "git svn dcommit": need help!

Josef Wolf· Dec 22, 2010, 11:50 UTC · lore

Hello,

I am using git-svn to track a subversion repository. This used to work fine so far. But today, I got a network outage during a "git svn dcommit" operation. I can see with gitk, that not all of my commits made it to the svn repositoy. I tried "git svn rebase" and "git svn dcommit" to resume, but they act as if I had no local commits.

Any hints how to fix the situation?

Jonathan Nieder· Dec 27, 2010, 00:57 UTC · re: Josef Wolf · lore

Re: Network problems during "git svn dcommit"

Josef Wolf wrote:

> I am using git-svn to track a subversion repository. This used to work
> fine so far. But today, I got a network outage during a "git svn dcommit"
> operation.

[...]

> Any hints how to fix the situation?

Yes.

To fix your repository:
 1. make backups!
 2. back out the bad commit so it is not visible with "gitk --all"
    (something like

	git reset --keep HEAD^
	git push . HEAD:refs/remotes/svn/Trunk

    )
 3. "rm -fr .git/svn/".  Note: this will delete your unhandled.log!
    Restore it from backup if you consider it precious.
 4. "git svn fetch; git svn rebase"

To fix "git svn", see [1].

Hope that helps, Jonathan

[1] http://thread.gmane.org/gmane.comp.version-control.git/136510