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 pointing at svn branch instead of trunk?
Date: Sat, 22 Aug 2009 19:51:01 -0700	[thread overview]
Message-ID: <20090823025101.GA22562@dcvr.yhbt.net> (raw)
In-Reply-To: <2729632a0908221512v7d7af188h28d11a4bc8f092fc@mail.gmail.com>

skillzero@gmail.com wrote:
> On Sat, Aug 22, 2009 at 1:46 PM, Eric Wong<normalperson@yhbt.net> wrote:
> 
> > So you have something like this?
> >
> > ----------trunk
> >              \
> >               \-> tag
> >
> > It looks like it's mixed but that's because trunk is an ancestor of your
> > tag, so the majority of commits (see git-svn-id:) look like they're from
> > trunk except the latest git-svn-id: which should have the URL of the tag
> > in it.  So in short, everything here is OK.
> 
> Yes, that's what I see: most of the commits have a /trunk URL except
> the last one has a /tags/TagX URL.
> 
> When the next commit happens on master (I don't have svn commit access
> on the svn repo to try it myself), will git svn automatically track
> master->trunk again? Or is there something I need to change to tell it
> "master tracks svn's /trunk"? I normally do git svn fetch and git svn
> rebase (while on master, I do all my own commits on a separate
> branch).

You need to reset your master to trunk so it knows to track trunk
instead of tags/TagX

-- 
Eric Wong

  reply	other threads:[~2009-08-23  2:51 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-22 18:40 git svn pointing at svn branch instead of trunk? skillzero
2009-08-22 20:46 ` Eric Wong
2009-08-22 22:12   ` skillzero
2009-08-23  2:51     ` Eric Wong [this message]
2009-08-30 20:30 ` Daniele Segato

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=20090823025101.GA22562@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).