{"thread":{"id":"23638","subject":"Multiple SVN remote branches listed in \"git branch -r\" after \"git-svn fetch\"","startedAt":"2010-04-30T18:59:23Z","lastAt":"2010-05-04T16:29:16Z","messageCount":2,"participants":["Bradley Wagner"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"140640","messageId":"v2q2f0f6ced1004301159z21c3539av4983488df963ddf0@mail.gmail.com","threadId":"23638","inReplyTo":null,"subject":"Multiple SVN remote branches listed in \"git branch -r\" after \"git-svn fetch\"","fromName":"Bradley Wagner","fromEmail":"bradley.wagner@hannonhill.com","sentAt":"2010-04-30T18:59:23Z","receivedAt":"2010-04-30T18:59:23Z","isPatch":false,"sender":{"key":"bradley.wagner@hannonhill.com","avatar":"https://gravatar.com/avatar/8304e5020b13d5f8102220fae2f5dd607a2e114dbe62bbd92c1ab38fe0b69fdb?d=mp&s=160"},"body":"So I did a conversion to Git using git-svn.\n\ngit init <svn_url>\n# updated the .git/config file to reference a few different locations\nfor branches:\n[svn-remote \"svn\"]\n        url = <svn_url>\n        fetch = cascade/trunk:refs/remotes/trunk\n        branches =\ncascade/branches/{hibernate-upgrade,spring-upgrade}}:refs/remotes/*\n        branches = cascade/branches/{6.x,5.x,4.x,3.x}/*:refs/remotes/*\n        tags = cascade/tags/{3.7.x,4.x,5.x,6.x,old-releases}/*:refs/remotes/tags/*\ngit svn fetch\n\nNow, I'm seeing branches/tags listed multiple times with: git branch -r\n\n  6.x/6.0.2.1\n  6.x/6.0.2.1@12401\n  6.x/6.0.2.1@12422\n....\n  tags/4.x/rel_4_22\n  tags/4.x/rel_4_22@4093\n  tags/4.x/rel_4_22@4384\n\nWhat do these other branches with the @ sign mean? Did I do something wrong?\n\nThanks,\nBradley\n"},{"id":"140916","messageId":"y2s2f0f6ced1005040929k7dc01731t5787dc8039031d73@mail.gmail.com","threadId":"23638","inReplyTo":"v2q2f0f6ced1004301159z21c3539av4983488df963ddf0@mail.gmail.com","subject":"Re: Multiple SVN remote branches listed in \"git branch -r\" after \"git-svn fetch\"","fromName":"Bradley Wagner","fromEmail":"bradley.wagner@hannonhill.com","sentAt":"2010-05-04T16:29:16Z","receivedAt":"2010-05-04T16:29:16Z","isPatch":false,"sender":{"key":"bradley.wagner@hannonhill.com","avatar":"https://gravatar.com/avatar/8304e5020b13d5f8102220fae2f5dd607a2e114dbe62bbd92c1ab38fe0b69fdb?d=mp&s=160"},"body":"By the way, I figured this out if you ever run into the same thing.\nWhen you fetch any SVN branches or tags that have ever been\nmoved/renamed, Git will create these other tags and branches with '@'\nsigns in them.\n\nFor example, these two branches:\n  4.x/v4_0\n  4.x/v4_0@8459\nmean that in r8460 the 4.0 branch was moved to a different location or\nrenamed. Good news is that the base branch \"4.x/v4_0\" contains the\nrevision history of both: everything before and after the move -- so\nit's the only one that matters when converting to git branches.\n\nJust an FYI.\n\nOn Fri, Apr 30, 2010 at 2:59 PM, Bradley Wagner\n<bradley.wagner@hannonhill.com> wrote:\n>\n> So I did a conversion to Git using git-svn.\n>\n> git init <svn_url>\n> # updated the .git/config file to reference a few different locations\n> for branches:\n> [svn-remote \"svn\"]\n>        url = <svn_url>\n>        fetch = cascade/trunk:refs/remotes/trunk\n>        branches =\n> cascade/branches/{hibernate-upgrade,spring-upgrade}}:refs/remotes/*\n>        branches = cascade/branches/{6.x,5.x,4.x,3.x}/*:refs/remotes/*\n>        tags = cascade/tags/{3.7.x,4.x,5.x,6.x,old-releases}/*:refs/remotes/tags/*\n> git svn fetch\n>\n> Now, I'm seeing branches/tags listed multiple times with: git branch -r\n>\n>  6.x/6.0.2.1\n>  6.x/6.0.2.1@12401\n>  6.x/6.0.2.1@12422\n> ....\n>  tags/4.x/rel_4_22\n>  tags/4.x/rel_4_22@4093\n>  tags/4.x/rel_4_22@4384\n>\n> What do these other branches with the @ sign mean? Did I do something wrong?\n>\n> Thanks,\n> Bradley\n\n\n\n--\nHannon Hill - Put Us to the Test\nbradley.wagner@hannonhill.com | http://www.hannonhill.com\n"}]}