Hello Michael, On Wed, Sep 17, 2008 at 1:25 AM, Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> wrote: > Michael Kerrisk venit, vidit, dixit 17.09.2008 00:05: >> Hello, >> >> I'm currently trying to import an svn repository, along with its tags, >> into git, and everything seems okay except that after the import I >> expect to have the following structure to my checked out repository: >> >> [root-dir] >> .git >> <checked-out-files> >> >> But instead I end up with >> >> [root-dir] >> .git >> man-pages <-- name of my svn project >> <checked-out-files> >> >> I've tried out a few different command-line flag settings but so far I >> haven't managed to get the desired layout. I guess that I'm missing >> something trivial, but I haven't worked out what it is so far. >> >> The commands I'm using to do the import are: >> >> $ git svn init file:///home/mtk/man-pages-rep/ -t tags -T trunk -b branches >> $ git svn fetch >> >> The svn tags are getting imported okay, since: >> >> git branch -a | head >> tags/man-pages-2.00 >> tags/man-pages-2.01 >> ... >> tags/man-pages-3.08 >> tags/man-pages-3.09 >> trunk >> >> The following commands show the layout of my svn repo, which is pretty >> much standard: >> >> $ svn list file:///home/mtk/man-pages-rep >> branches/ >> tags/ >> trunk/ >> $ svn list file:///home/mtk/man-pages-rep/trunk >> man-pages/ > > That's the part that says that your layout is non-standard. What do your > branches and tags look like? Do they have that superfluous "man-pages" > part as well? $ svn list file:///home/mtk/man-pages-rep/tags man-pages-2.00 man-pages-2.01 man-pages-2.02 man-pages-2.03 ... $ svn list file:///home/mtk/man-pages-rep/tags/man-pages-2.00 man-pages $ svn list file:///home/mtk/man-pages-rep/tags/man-pages-2.01 man-pages [and so on] $ svn list file:///home/mtk/man-pages-rep/branches $ (i.e., no branches, since this has been a linear svn repo.) >> $ svn list file:///home/mtk/man-pages-rep/trunk/man-pages >> Changes >> Changes.old >> Makefile >> README >> man-pages-3.09.Announce >> ... >> man7/ >> man8/ >> scripts/ >> $ svn list file:///home/mtk/man-pages-rep/tags >> man-pages-2.00/ >> man-pages-2.01/ >> ... >> man-pages-3.08/ >> man-pages-3.09/ >> >> What 'git svn init' command do I need to get the layout that I want >> for my imported git repo? > > It depends on the structure of your branches and tags. My guess would be > that you have something like tags/man-pages-2.00/man-pages/ etc., in > which case you would need a special configuration if you want to get rid > of the "man-pages" part. Tells us your structure, we'll tell you the > config ;) Do you now have enough info above? Thanks, Michael -- Michael Kerrisk Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/ man-pages online: http://www.kernel.org/doc/man-pages/online_pages.html Found a bug? http://www.kernel.org/doc/man-pages/reporting_bugs.html -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html