Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Re: Network problems during "git svn dcommit"

From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:50:18

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help