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
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
[off-list ref] 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