When converting from svn to git using git-svn or svn2git, how can I change the base path of the repository and possibly still keep branches/tags?

℡╲_俬逩灬. 提交于 2019-12-11 07:18:20

问题


I'm moving a project from SVN to git (completely, so no need for git svn's SVN interop features) and I've tried using both git svn and svn2git (nirvdrum's fork on github) and one problem I've got is that our repository layout in SVN was like so:

example.com/website/trunk|branches|tags/base/code,

and so when I import it into git, the root directory of the repository contains one directory, base (not the real name) and then all the stuff. This is kind of a problem for us, as it adds a few complications.

Is there a good and easy way to change the root of the repository to be base, either during the import or retroactively with git's mad history-changing powers? Otherwise, a directory that shouldn't be the root of the repository and contains other unrelated code will have to be the root of the repository in git, which is strange, and for some reason, with SVN this was not the case (i.e. the root of the repository was base, and the parent directory did not have any svn stuff).

Hopefully this is a quick question that someone can answer easily.

Oh, by the way, I do sort of have branches and tags I want to import, but again these should be rooted at base, not the parent directory of base. It's not a biggie if these aren't possible to be imported like that because they are pretty much useless and the team was kind of half-heartedly using SVN before, but it would be nice to have them.


回答1:


svn2git takes options for that as well; using the example in Charles' answer it would be:

svn2git --trunk example.com/website/trunk/base/code \
        --tags example.com/website/tags/base/code \
        --branches example.com/website/branches/base/code

[Caveat: I haven't tried this, but as far as I know, svn2git just converts those into the -T|t|b options for git-svn.]




回答2:


You should be able to do:

git svn init -Texample.com/website/trunk/base/code -texample.com/website/tags/base/code -bexample.com/website/branches/base/code

instead of accepting the default or using -s|--stdlayout.



来源:https://stackoverflow.com/questions/1292531/when-converting-from-svn-to-git-using-git-svn-or-svn2git-how-can-i-change-the-b

标签
易学教程内所有资源均来自网络或用户发布的内容,如有违反法律规定的内容欢迎反馈
该文章没有解决你所遇到的问题?点击提问,说说你的问题,让更多的人一起探讨吧!