git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Wong <normalperson@yhbt.net>
To: skillzero@gmail.com
Cc: git@vger.kernel.org
Subject: Re: git svn master pointing to commit for older svn tag?
Date: Sat, 9 May 2009 18:37:42 -0700	[thread overview]
Message-ID: <20090510013742.GC2000@dcvr.yhbt.net> (raw)
In-Reply-To: <2729632a0905061459v6c257b3ay60e1f454e8f2bb4a@mail.gmail.com>

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

      reply	other threads:[~2009-05-10  1:38 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-06 21:59 git svn master pointing to commit for older svn tag? skillzero
2009-05-10  1:37 ` Eric Wong [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090510013742.GC2000@dcvr.yhbt.net \
    --to=normalperson@yhbt.net \
    --cc=git@vger.kernel.org \
    --cc=skillzero@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).