{"thread":{"id":"29013","subject":"svn to git with non-standard layout","startedAt":"2011-11-23T19:23:34Z","lastAt":"2011-11-23T21:45:32Z","messageCount":5,"participants":["Bernd Schubert","Stephen Bash","Frans Klaver"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"179904","messageId":"jajh7m$it7$1@dough.gmane.org","threadId":"29013","inReplyTo":null,"subject":"svn to git with non-standard layout","fromName":"Bernd Schubert","fromEmail":"bernd.schubert@itwm.fraunhofer.de","sentAt":"2011-11-23T19:23:34Z","receivedAt":"2011-11-23T19:23:34Z","isPatch":false,"sender":{"key":"bernd.schubert@itwm.fraunhofer.de","avatar":null},"body":"Hi all,\n\nwe just want to migrate from subversion to git, but so far all attempts \nto do that resulted in missing commit information.\n\nSo we have an svn repo with multiple sub-repos. The trouble is now that \nthose sub-repos have their own trunk/tags (no branches) directories, but \nactually those projects are very dependent on each other and lots of \ncommits go to many sub-project in a single commit.\nSo our new git repository shall meld all sub-projects into a new common \nrepository.\n\nSo we have something like this:\n\nsvn-root -> main-project\n / | \\\n / | \\\n proj1 proj2 proj{n}\n / \\ / \\ / \\\n / \\ / \\ trunk tags\n / \\ trunk tags\n trunk tags\n / \\\n tag1 tag{2...n}\n\n\nI think the same issue has been asked a few times before, for example here:\n\nhttp://comments.gmane.org/gmane.comp.version-control.git/163491\n\nbut I still do not know how to properly convert the old structure into a \nnew global one. So we simply want to have:\n\nbranches,tags <- main-project -> {proj1, proj2, ..., projN}\n\nI think the above link suggests something like\n\n[svn-remote \"svn\"]\n url = https://some-repo-url\n fetch=/:refs/remotes/svnroot\n fetch = build_scripts/trunk:refs/remotes/build_scripts/trunk\n fetch = create_repos/trunk:refs/remotes/create_repos/trunk\n\n\nWhen I'm going to to 'svn fetch' this, files from different projects are \ngoing to be in the same directory. But of course, the project directory \nstructure is supposed to stay as it it.\n\nAny ideas what I still could try to do?\n\n\nThanks,\nBernd\n"},{"id":"179907","messageId":"2d5f33eb-c1dc-491a-a8ed-e8ceaaf2e2b1@mail","threadId":"29013","inReplyTo":"jajh7m$it7$1@dough.gmane.org","subject":"Re: svn to git with non-standard layout","fromName":"Stephen Bash","fromEmail":"bash@genarts.com","sentAt":"2011-11-23T20:22:14Z","receivedAt":"2011-11-23T20:22:14Z","isPatch":false,"sender":{"key":"bash@genarts.com","avatar":null},"body":"----- Original Message -----\n> From: \"Bernd Schubert\" \n> To: git@vger.kernel.org\n> Sent: Wednesday, November 23, 2011 2:23:34 PM\n> Subject: svn to git with non-standard layout\n> \n> So we have something like this:\n> \n> svn-root -> main-project\n> / | \\\n> / | \\\n> proj1 proj2 proj{n}\n> / \\ / \\ / \\\n> / \\ / \\ trunk tags\n> / \\ trunk tags\n> trunk tags\n> / \\\n> tag1 tag{2...n}\n\nJust for clarification: are there files and/or directories in main-project that are not sub-projects?\n\nThanks,\nStephen\n"},{"id":"179911","messageId":"4ECD5D04.6090100@itwm.fraunhofer.de","threadId":"29013","inReplyTo":"2d5f33eb-c1dc-491a-a8ed-e8ceaaf2e2b1@mail","subject":"Re: svn to git with non-standard layout","fromName":"Bernd Schubert","fromEmail":"bernd.schubert@itwm.fraunhofer.de","sentAt":"2011-11-23T20:52:20Z","receivedAt":"2011-11-23T20:52:20Z","isPatch":false,"sender":{"key":"bernd.schubert@itwm.fraunhofer.de","avatar":null},"body":"On 11/23/2011 09:22 PM, Stephen Bash wrote:\n> ----- Original Message -----\n>> From: \"Bernd Schubert\"\n>> To: git@vger.kernel.org\n>> Sent: Wednesday, November 23, 2011 2:23:34 PM\n>> Subject: svn to git with non-standard layout\n>>\n>> So we have something like this:\n>>\n>> svn-root -> main-project\n>> / | \\\n>> / | \\\n>> proj1 proj2 proj{n}\n>> / \\ / \\ / \\\n>> / \\ / \\ trunk tags\n>> / \\ trunk tags\n>> trunk tags\n>> / \\\n>> tag1 tag{2...n}\n>\n> Just for clarification: are there files and/or directories in main-project that are not sub-projects?\n\nYes that as well, sorry, forgot to tell about this. If those should be \ntroublesome, we might simply ignore them, as those are not that \nimportant to have a full history, though.\n\n\nThanks,\nBernd\n"},{"id":"179912","messageId":"op.v5e36lxp0aolir@keputer.lokaal","threadId":"29013","inReplyTo":"jajh7m$it7$1@dough.gmane.org","subject":"Re: svn to git with non-standard layout","fromName":"Frans Klaver","fromEmail":"fransklaver@gmail.com","sentAt":"2011-11-23T21:19:23Z","receivedAt":"2011-11-23T21:19:23Z","isPatch":false,"sender":{"key":"fransklaver@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1876483?v=4"},"body":"On Wed, 23 Nov 2011 20:23:34 +0100, Bernd Schubert \n wrote:\n\n> we just want to migrate from subversion to git, but so far all attempts \n> to do that resulted in missing commit information.\n\nWhat are all attempts? Did you try only git-svn, or did you try tools like \nsvn2git?\n\n\n> Any ideas what I still could try to do?\n\nIf you haven't tried anything other than git-svn, try svneverever & \nsvn2git[1] for an actual repository conversion. Or have a look at the \nnewest kid on the block called SubGit[2][3]. In both I don't have any \nexperience, but of svn2git I know Qt and KDE have used it successfully to \nconvert their repositories.\n\nI assume both are somewhat more complex to use and set up than to simply \nuse git-svn, but I guess it will be worth the effort.\n\nGood luck,\nFrans\n\n[1] http://techbase.kde.org/Projects/MoveToGit/UsingSvn2Git\n[2] http://subgit.com/\n[3] http://thread.gmane.org/gmane.comp.version-control.git/185806\n"},{"id":"179917","messageId":"4ECD697C.5010109@itwm.fraunhofer.de","threadId":"29013","inReplyTo":"op.v5e36lxp0aolir@keputer.lokaal","subject":"Re: svn to git with non-standard layout","fromName":"Bernd Schubert","fromEmail":"bernd.schubert@itwm.fraunhofer.de","sentAt":"2011-11-23T21:45:32Z","receivedAt":"2011-11-23T21:45:32Z","isPatch":false,"sender":{"key":"bernd.schubert@itwm.fraunhofer.de","avatar":null},"body":"On 11/23/2011 10:19 PM, Frans Klaver wrote:\n> On Wed, 23 Nov 2011 20:23:34 +0100, Bernd Schubert\n> wrote:\n>\n>> we just want to migrate from subversion to git, but so far all\n>> attempts to do that resulted in missing commit information.\n>\n> What are all attempts? Did you try only git-svn, or did you try tools\n> like svn2git?\n\nWe are trying to do this ever since Monday and it included svn2git as \nwell. The problem with svn2git is that you can provide several tags and \nbranch paths, but only a single trunk path.\n\n>\n>\n>> Any ideas what I still could try to do?\n>\n> If you haven't tried anything other than git-svn, try svneverever &\n> svn2git[1] for an actual repository conversion. Or have a look at the\n> newest kid on the block called SubGit[2][3]. In both I don't have any\n> experience, but of svn2git I know Qt and KDE have used it successfully\n> to convert their repositories.\n>\n> I assume both are somewhat more complex to use and set up than to simply\n> use git-svn, but I guess it will be worth the effort.\n>\n> Good luck,\n> Frans\n>\n> [1] http://techbase.kde.org/Projects/MoveToGit/UsingSvn2Git\n> [2] http://subgit.com/\n> [3] http://thread.gmane.org/gmane.comp.version-control.git/185806\n\nThanks, I'm going to read about svneverever and SubGit tomorrow. We will \nalso try another tool that can convert an svn dump (once we get a dump, \nas we don't have easy access to the svn database).\n\nThanks,\nBernd\n"}]}