git svn fetch & rebase broken after connection failure

Question

I lost my network connection during git svn dcommit when it was trying to rebase. I tried to git svn rebase again, but again lost my network connection.

Now, after sorting out my network connection problems, I am left with a situation in which git svn rebase and git svn fetch both do nothing.

I know that the SVN commit did indeed happen because a successful Jenkins build was triggered from SVN. But the SVN version of the commit doesn't show up in git log trunk after doing a git svn fetch!

Robin Green · Accepted Answer · 2014-07-24 10:32:32Z

2

+200

You need to check if this isn't because of the local metadata stored in your git-svn repo, as described in this gist:

The problem is, git-svn decided to store some metadata about what revisions were checked so it doesn't have to check them again based on the remote tracking branch name.
It's not going to check them again as long as that data exists.

The solution is simple:

rm .git/svn/refs/remotes/mynewbranch -Rf && git svn fetch

In your case, try (on a copy of your local repo just for testing)

rm .git/svn/refs/remotes/trunk -Rf && git svn fetch

edited Jul 24, 2014 at 10:32

Robin Green

33.4k20 gold badges112 silver badges197 bronze badges

answered Jul 22, 2014 at 9:07

VonC

1.4m569 gold badges4.8k silver badges5.7k bronze badges

Sign up to request clarification or add additional context in comments.

Collectives™ on Stack Overflow

git svn fetch & rebase broken after connection failure

1 Answer 1

Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

Comments

Your Answer

Sign up or log in

Post as a guest

Related