Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN

From: Eric Wong <normalperson@yhbt.net>
Date: Mar 29, 2009, 22:16 UTC
Message-ID: <20090329221642.GA16507@dcvr.yhbt.net>
In-Reply-To: <fabb9a1e0903290555o3503b58ie097f8f8336c4401@mail.gmail.com>

Sverre Rabbelier <srabbelier@gmail.com> wrote:

Show 11 quoted lines

> Heya,
> 
> On Sun, Mar 29, 2009 at 14:53, jamespetts <jamespetts@yahoo.com> wrote:
> >
> > "Unable to determine upstream SVN infromation from working tree history".
> >
> > Have I done something wrong...?
> 
> I'm afraid this is where my git-svn knowledge is no longer sufficient
> :(. I have had the same problem myself, and I don't know how to fix
> it, perhaps Eric has a moment to enlighten?

What does "git log" in your working tree say before you run "git svn rebase"?

Then, what does "git log <ref_of_svn_remote_you_reset_to>" say?

"git svn rebase" relies on the "git-svn-id:" line in the log message as well as the stored checksum to determine how to rebase the current HEAD.

However, "git svn fetch" should always work[1] and not touch the current HEAD. You can run "git svn fetch" to get the new updates and then push your remotes out as heads by setting up your pushes to github like this .git/config (totally untested):

[remote "github"]
	url = user@github.com/foo/bar.git
	push = refs/remotes/*:refs/heads/*

[1] - at least on POSIX, I don't know if git-svn is still broken in Windows and can't help if is.

-- 
Eric Wong