* git svn master pointing to commit for older svn tag?
@ 2009-05-06 21:59 skillzero
2009-05-10 1:37 ` Eric Wong
0 siblings, 1 reply; 2+ messages in thread
From: skillzero @ 2009-05-06 21:59 UTC (permalink / raw)
To: git
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?
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: git svn master pointing to commit for older svn tag?
2009-05-06 21:59 git svn master pointing to commit for older svn tag? skillzero
@ 2009-05-10 1:37 ` Eric Wong
0 siblings, 0 replies; 2+ messages in thread
From: Eric Wong @ 2009-05-10 1:37 UTC (permalink / raw)
To: skillzero; +Cc: git
skillzero@gmail.com wrote:
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-05-10 1:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-05-06 21:59 git svn master pointing to commit for older svn tag? skillzero
2009-05-10 1:37 ` Eric Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).