From: Bradley Wagner <bradley.wagner@hannonhill.com>
To: git@vger.kernel.org
Subject: Re: Multiple SVN remote branches listed in "git branch -r" after "git-svn fetch"
Date: Tue, 4 May 2010 12:29:16 -0400 [thread overview]
Message-ID: <y2s2f0f6ced1005040929k7dc01731t5787dc8039031d73@mail.gmail.com> (raw)
In-Reply-To: <v2q2f0f6ced1004301159z21c3539av4983488df963ddf0@mail.gmail.com>
By the way, I figured this out if you ever run into the same thing.
When you fetch any SVN branches or tags that have ever been
moved/renamed, Git will create these other tags and branches with '@'
signs in them.
For example, these two branches:
4.x/v4_0
4.x/v4_0@8459
mean that in r8460 the 4.0 branch was moved to a different location or
renamed. Good news is that the base branch "4.x/v4_0" contains the
revision history of both: everything before and after the move -- so
it's the only one that matters when converting to git branches.
Just an FYI.
On Fri, Apr 30, 2010 at 2:59 PM, Bradley Wagner
<bradley.wagner@hannonhill.com> wrote:
>
> So I did a conversion to Git using git-svn.
>
> git init <svn_url>
> # updated the .git/config file to reference a few different locations
> for branches:
> [svn-remote "svn"]
> url = <svn_url>
> fetch = cascade/trunk:refs/remotes/trunk
> branches =
> cascade/branches/{hibernate-upgrade,spring-upgrade}}:refs/remotes/*
> branches = cascade/branches/{6.x,5.x,4.x,3.x}/*:refs/remotes/*
> tags = cascade/tags/{3.7.x,4.x,5.x,6.x,old-releases}/*:refs/remotes/tags/*
> git svn fetch
>
> Now, I'm seeing branches/tags listed multiple times with: git branch -r
>
> 6.x/6.0.2.1
> 6.x/6.0.2.1@12401
> 6.x/6.0.2.1@12422
> ....
> tags/4.x/rel_4_22
> tags/4.x/rel_4_22@4093
> tags/4.x/rel_4_22@4384
>
> What do these other branches with the @ sign mean? Did I do something wrong?
>
> Thanks,
> Bradley
--
Hannon Hill - Put Us to the Test
bradley.wagner@hannonhill.com | http://www.hannonhill.com
prev parent reply other threads:[~2010-05-04 16:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-30 18:59 Multiple SVN remote branches listed in "git branch -r" after "git-svn fetch" Bradley Wagner
2010-05-04 16:29 ` Bradley Wagner [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=y2s2f0f6ced1005040929k7dc01731t5787dc8039031d73@mail.gmail.com \
--to=bradley.wagner@hannonhill.com \
--cc=git@vger.kernel.org \
/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).