git svn master pointing to commit for older svn tag?

skillzero@gmail.com· May 6, 2009, 21:59 UTC · lore

I'm using git svn to sync to a Subversion repository and it generally works, but somehow, it seems to have gotten into a state where master is pointing to the commit for an old svn tag rather than to the svn trunk so 'git svn rebase' never does anything.

If I look in .git/info/refs, I see that refs/heads/master is pointing to the commit for a specific tag and I can change to point to something else, but I'm wondering how it got into this state and if there's a better way to tell git svn to go back to using the svn trunk so future rebases work correctly?

Eric Wong· May 10, 2009, 01:37 UTC · re: skillzero@gmail.com · lore

Re: git svn master pointing to commit for older svn tag?

skillzero@gmail.com wrote:

Show 10 quoted lines

> I'm using git svn to sync to a Subversion repository and it generally
> works, but somehow, it seems to have gotten into a state where master
> is pointing to the commit for an old svn tag rather than to the svn
> trunk so 'git svn rebase' never does anything.
> 
> If I look in .git/info/refs, I see that refs/heads/master is pointing
> to the commit for a specific tag and I can change to point to
> something else, but I'm wondering how it got into this state and if
> there's a better way to tell git svn to go back to using the svn trunk
> so future rebases work correctly?

You can use "git rebase refs/remotes/trunk" on any working tree to reapply your current work against trunk. "git svn rebase" just uses "git rebase" internally anyways.

-- 
Eric Wong