{"thread":{"id":"23529","subject":"SVN to Git: trunk moved during repository history","startedAt":"2010-04-19T21:18:16Z","lastAt":"2010-04-27T19:55:15Z","messageCount":5,"participants":["Bradley Wagner","Stephen Kelly","Ulrich Spörlein"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"139931","messageId":"o2i2f0f6ced1004191418i6a144652sd9ac38b07fb7b661@mail.gmail.com","threadId":"23529","inReplyTo":"l2x2f0f6ced1004191416jd8db7d5eyf8fc7a55f5efa2cc@mail.gmail.com","subject":"SVN to Git: trunk moved during repository history","fromName":"Bradley Wagner","fromEmail":"bradley.wagner@hannonhill.com","sentAt":"2010-04-19T21:18:16Z","receivedAt":"2010-04-19T21:18:16Z","isPatch":false,"sender":{"key":"bradley.wagner@hannonhill.com","avatar":"https://gravatar.com/avatar/8304e5020b13d5f8102220fae2f5dd607a2e114dbe62bbd92c1ab38fe0b69fdb?d=mp&s=160"},"body":"I'm trying to port an SVN project to Git. We have gone through\nmultiple layouts for our SVN repository. It started off with just a\nmainline branch in the root folder. Then we went to the standard\nlayout (branches, trunk, tags).\n\nThe problem is that when I do a \"git svn clone --stdlayout\" of the\nrepository, it's not picking up any of the revisions from when the\ntrunk previously resided in the root directory.\nIs there any way to specify that the trunk had multiple paths the way\nyou can specify multiple branch folders with -b flag? What would be\nthe best course of action for reporting an SVN repo who's layout had\nchanged during its history?\n\nThanks,\nBradley\n"},{"id":"139945","messageId":"hqir8c$sqh$1@dough.gmane.org","threadId":"23529","inReplyTo":"o2i2f0f6ced1004191418i6a144652sd9ac38b07fb7b661@mail.gmail.com","subject":"Re: SVN to Git: trunk moved during repository history","fromName":"Stephen Kelly","fromEmail":"steveire@gmail.com","sentAt":"2010-04-20T00:07:40Z","receivedAt":"2010-04-20T00:07:40Z","isPatch":false,"sender":{"key":"steveire@gmail.com","avatar":null},"body":"Bradley Wagner wrote:\n\n> I'm trying to port an SVN project to Git. We have gone through\n> multiple layouts for our SVN repository. It started off with just a\n> mainline branch in the root folder. Then we went to the standard\n> layout (branches, trunk, tags).\n> \n> The problem is that when I do a \"git svn clone --stdlayout\" of the\n> repository, it's not picking up any of the revisions from when the\n> trunk previously resided in the root directory.\n> Is there any way to specify that the trunk had multiple paths the way\n> you can specify multiple branch folders with -b flag? What would be\n> the best course of action for reporting an SVN repo who's layout had\n> changed during its history?\n\nOne option is svn2git\n\nhttp://gitorious.org/svn2git/svn2git\n\nhttp://techbase.kde.org/Projects/MoveToGit/UsingSvn2Git\n\nexamples:\n\nhttp://gitorious.org/svn2git/kde-ruleset\n\n> \n> Thanks,\n> Bradley\n"},{"id":"140030","messageId":"l2o2f0f6ced1004210703rf3ce8781kd209e99d2b577b76@mail.gmail.com","threadId":"23529","inReplyTo":"hqir8c$sqh$1@dough.gmane.org","subject":"Re: SVN to Git: trunk moved during repository history","fromName":"Bradley Wagner","fromEmail":"bradley.wagner@hannonhill.com","sentAt":"2010-04-21T14:03:16Z","receivedAt":"2010-04-21T14:03:16Z","isPatch":false,"sender":{"key":"bradley.wagner@hannonhill.com","avatar":"https://gravatar.com/avatar/8304e5020b13d5f8102220fae2f5dd607a2e114dbe62bbd92c1ab38fe0b69fdb?d=mp&s=160"},"body":"Hmm, I'm not seeing where in the documentation you would instruct it\nto look in multiple locations in the SVN repository's history for the\ntrunk branch.\n\nOn Mon, Apr 19, 2010 at 8:07 PM, Stephen Kelly wrote:\n> Bradley Wagner wrote:\n>\n>> I'm trying to port an SVN project to Git. We have gone through\n>> multiple layouts for our SVN repository. It started off with just a\n>> mainline branch in the root folder. Then we went to the standard\n>> layout (branches, trunk, tags).\n>>\n>> The problem is that when I do a \"git svn clone --stdlayout\" of the\n>> repository, it's not picking up any of the revisions from when the\n>> trunk previously resided in the root directory.\n>> Is there any way to specify that the trunk had multiple paths the way\n>> you can specify multiple branch folders with -b flag? What would be\n>> the best course of action for reporting an SVN repo who's layout had\n>> changed during its history?\n>\n> One option is svn2git\n>\n> http://gitorious.org/svn2git/svn2git\n>\n> http://techbase.kde.org/Projects/MoveToGit/UsingSvn2Git\n>\n> examples:\n>\n> http://gitorious.org/svn2git/kde-ruleset\n>\n>>\n>> Thanks,\n>> Bradley\n>\n>\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n>\n"},{"id":"140222","messageId":"20100423151235.GZ92627@acme.spoerlein.net","threadId":"23529","inReplyTo":"l2o2f0f6ced1004210703rf3ce8781kd209e99d2b577b76@mail.gmail.com","subject":"Re: SVN to Git: trunk moved during repository history","fromName":"Ulrich Spörlein","fromEmail":"uqs@spoerlein.net","sentAt":"2010-04-23T15:12:35Z","receivedAt":"2010-04-23T15:12:35Z","isPatch":false,"sender":{"key":"uqs@spoerlein.net","avatar":null},"body":"On Wed, 21.04.2010 at 10:03:16 -0400, Bradley Wagner wrote:\n> Hmm, I'm not seeing where in the documentation you would instruct it\n> to look in multiple locations in the SVN repository's history for the\n> trunk branch.\n\nI did this for the FreeBSD repo, where one or two branches were moved to\nsome other level. I can't get to the rule file right now, but you need\nto figure out the revisions when the layout changed.\n\nThen use something like this (from the top of my head, most likely\nbuggy)\n\nmatch /\n min-revision 1\n max-revision 100\n branch master\nend\n\nmatch /trunk\n min-revision 101\n branch master\nend\n\n... you get the drift. Ask again if something is unclear, next time I\nget to my rules files I can give you a better example.\n\nBye,\nUli\n"},{"id":"140536","messageId":"v2l2f0f6ced1004271255m6d4a7f70o87be795c87fb66e5@mail.gmail.com","threadId":"23529","inReplyTo":"o2i2f0f6ced1004191418i6a144652sd9ac38b07fb7b661@mail.gmail.com","subject":"Re: SVN to Git: trunk moved during repository history","fromName":"Bradley Wagner","fromEmail":"bradley.wagner@hannonhill.com","sentAt":"2010-04-27T19:55:15Z","receivedAt":"2010-04-27T19:55:15Z","isPatch":false,"sender":{"key":"bradley.wagner@hannonhill.com","avatar":"https://gravatar.com/avatar/8304e5020b13d5f8102220fae2f5dd607a2e114dbe62bbd92c1ab38fe0b69fdb?d=mp&s=160"},"body":"So, I tried to clone the repository with this command:\n\ngit svn clone -T trunk -t tags/6.x -b branches/6.x /\n\nAfter it completed, I went it to the .git/config file and added a few\nmore branches/tags from other locations:\n\n[svn-remote \"svn\"]\n url = https:///\n fetch = /trunk:refs/remotes/trunk\n branches = /branches/{6.x,5.x}/*:refs/remotes/*\n branches = /branches/*:refs/remotes/*\n tags = /tags/{3.7.x,4.x,5.x,6.x,old-releases}/*:refs/remotes/tags/*\n\nIs my syntax even correct? Can I have more than one \"branches\"\nproperty? How do I tell git-svn to re-sync with the latest branch/tag\nlocations?\n\nThanks!\n\nOn Mon, Apr 19, 2010 at 5:18 PM, Bradley Wagner\n wrote:\n> I'm trying to port an SVN project to Git. We have gone through\n> multiple layouts for our SVN repository. It started off with just a\n> mainline branch in the root folder. Then we went to the standard\n> layout (branches, trunk, tags).\n>\n> The problem is that when I do a \"git svn clone --stdlayout\" of the\n> repository, it's not picking up any of the revisions from when the\n> trunk previously resided in the root directory.\n> Is there any way to specify that the trunk had multiple paths the way\n> you can specify multiple branch folders with -b flag? What would be\n> the best course of action for reporting an SVN repo who's layout had\n> changed during its history?\n>\n> Thanks,\n> Bradley\n>\n"}]}