[英]How to reconnect git branches to master after migration from svn?
I have migrated a large svn repository to git using svn2git . 我已经使用svn2git将大型svn存储库迁移到git了。 Now I have the following situation: 现在我有以下情况:
The image is from my GitLab overview. 该图像来自我的GitLab概述。 As you can see, the branches created with svn are not connected to the red master branch. 如您所见,使用svn创建的分支未连接到红色的master分支。 Is it possible to "reconnect" the initial green commit to the master branch? 是否可以将初始的绿色提交“重新连接”到master分支? Because of this, every branch is about 5k commits behind master and I'd like to fix that. 因此,每个分支在master后面大约有5k的提交,我想修复它。
Thank you! 谢谢!
git-svn
is not the right tool for one-time conversions of repositories or repository parts. git-svn
不是一次转换存储库或存储库零件的正确工具。 It is a great tool if you want to use Git as frontend for an existing SVN server, but for one-time conversions you should not use git-svn
, but svn2git
which is much more suited for this use-case. 这是一个伟大的工具,如果你想使用Git的作为前端为现有的SVN服务器,但对于一次性转换,你不应该使用git-svn
,但svn2git
这是该用例更加适合。
The svn2git
utility you have used is based on git-svn
and thus suffers from most of the same drawbacks. 您使用的svn2git
实用程序基于git-svn
,因此也存在大多数相同的缺点。
There are plenty tools called svn2git
, the probably best one is the KDE one from https://github.com/svn-all-fast-export/svn2git . 有很多名为svn2git
工具,可能最好的一种是来自https://github.com/svn-all-fast-export/svn2git的KDE工具。 I strongly recommend using that svn2git
tool. 我强烈建议您使用该svn2git
工具。 It is the best I know available out there and it is very flexible in what you can do with its rules files. 这是我所知道的最好的,它可以很灵活地处理其规则文件。
You will be easily able to configure svn2git
s rule file to produce the result you want and it is a gazillion faster. 您将可以轻松配置svn2git
的规则文件以生成所需的结果,并且速度更快。
If you are not 100% about the history of your repository, svneverever
from http://blog.hartwork.org/?p=763 is a great tool to investigate the history of an SVN repository when migrating it to Git. 如果您不是100%知道存储库的历史记录, svneverever
从http://blog.hartwork.org/?p=763 svneverever
是将SVN存储库迁移到Git时调查其历史记录的好工具。
Even though git-svn
is easier to start with, here are some further reasons why using the KDE svn2git
instead of git-svn
is superior, besides its flexibility: 尽管开始使用git-svn
更容易,但是还有以下一些原因,为什么除了使用它的灵活性之外,使用KDE svn2git
代替git-svn
更为优越:
svn2git
(if the correct one is used), this is especially the case for more complex histories with branches and merges and so on svn2git
更好地重建历史记录(如果使用了正确的历史记录),尤其是对于具有分支和合并等更复杂历史记录的情况 git-svn
the tags contain an extra empty commit which also makes them not part of the branches, so a normal fetch
will not get them until you give --tags
to the command as by default only tags pointing to fetched branches are fetched also. 使用git-svn
标签会包含一个额外的空提交,这也会使它们不成为分支的一部分,因此,在您将--tags
给命令之前,正常的fetch
不会获取它们,因为默认情况下,还会仅获取指向获取的分支的标签。 With the proper svn2git tags are where they belong 带有正确的svn2git标签是它们所属的位置 svn2git
, with git-svn
you will loose history eventually 如果您在SVN中更改了布局,则可以轻松地使用svn2git
配置,而使用git-svn
最终会丢失历史记录 svn2git
you can also split one SVN repository into multiple Git repositories easily 使用svn2git
您还可以轻松地将一个SVN存储库拆分为多个Git存储库 svn2git
than with git-svn
正确的svn2git
比git-svn
快svn2git
倍 You see, there are many reasons why git-svn
is worse and the KDE svn2git
is superior. 您会看到git-svn
较差而KDE svn2git
较差的原因很多。 :-) :-)
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.