我想分享一个在WordPress社区中使用的很棒的工具，叫做Scatter

Git WordPress插件和一点理智的分散

这使得用户能够自动将他们的Git存储库发送到wordpress.org SVN。理论上，这段代码可以应用于任何SVN存储库。

这就是我要做的。假设我的本地分支名为main。填补空白，因为我不记得确切的git svn命令，因为我已经有一段时间没有使用它了。

create in svn the branch that will be used for the project. use git svn to clone the svn repo you want (at least, the branch you want to use so that you do not have to fetch the other millions of revisions that we do not care about for this endeavor). checkout the svn branch in the new git repo. Add to this repository a remote that points to the original git repo you are using for the project. Let's say the remote is called the-real-stuff. git fetch the-real-stuff # so that we get to see what's in the real repo Given that this is the first time we will be pulling our code into the svn one, we have to trick git so that it can "merge" that code: git merge --allow-unrelated-histories the-real-stuff/main -m "Whatever comment I want in the svn revision". This will "merge" both branches locally. git svn dcommit so that you can push the content of the project as it is right now.

继续工作在原来的git回购。然后，当你想要推入svn时，去到git的svn clone，然后做:

git fetch the-real-stuff # get visibility to the changes in the original git repo
git merge the-real-stuff/main -m "Whatever comment I want to show on this svn revision"
git svn dcommit

这样就做完了。

我喜欢使用2个回购的想法，这样我们就不用用svn的东西来填充原始的回购，尽管有可能将整个东西保留在一个git回购中。

下面是我们如何做到的:

在你的机器上克隆你的Git存储库。

打开.git/config并添加以下内容(来自维护Git存储库的只读SVN镜像):

[svn-remote "svn"]
    url = https://your.svn.repo
    fetch = :refs/remotes/git-svn

现在，在控制台窗口中输入以下内容:

git svn fetch svn
git checkout -b svn git-svn
git merge master

现在，如果它因为某种原因在这里中断了，输入这三行:

git checkout --theirs .
git add .
git commit -m "some message"

最后，您可以提交到SVN:

git svn dcommit

注意:我总是在事后丢弃那个文件夹。

最近我不得不将几个Git存储库迁移到SVN上，在尝试了我能找到的所有解决方案之后，最后对我有用的是Mercurial(是的，使用了第三种VCS)。根据这份指南，我提出了以下流程(适用于Linux，但基本思路也适用于Windows)。

The necessary packages: $ sudo apt-get install git subversion mercurial python-subversion Mercurial needs to be configured by adding the following to ~/.hgrc: [extensions] hgext.convert= Create some temporary working directories (I had several repositories to migrate so I created directories for the SVN and Git versions, to keep them separate): $ mkdir svn $ mkdir git Make an empty local SVN repository: $ svnadmin create svn/project Clone the existing Git repository: $ git clone server/path/project.git git/project Let Mercurial do its thing: $ hg convert --dest-type svn git/project svn/project Now the SVN repository should contain the full commit history, but not with original timestamps. If this is not an issue, skip over the next part to step 11. With a little work, the date and time of each commit can be changed. Since my repositories are fairly small, it was feasible for me to do it manually. First, create a pre-revprop-change hook in the SVN repository with the following contents, to allow the necessary property to be modified: #!/bin/bash exit 0; This script has to be made executable: $ chmod +x svn/project/hooks/pre-revprop-change Mercurial created a working copy of the SVN repository, named project-wc, so switch to it and edit the commit times: $ cd project-wc $ svn propedit svn:date --revprop -r 1 Enter the correct date and time (pay attention to timezones!) and save. You should get a message saying "Set new value for property svn:date on revision 1". Now rinse and repeat for every other revision. Optionally check the commit history to make sure everything looks OK: $ svn log -r 1:HEAD Then go back up one level: $ cd .. Dump the repository: $ svnadmin dump svn/project > project.dump And load the dump on your Subversion server. Done!

这个过程可能也可以直接在远程存储库之间工作，但是我发现与本地存储库一起工作更容易。修正提交时间需要做很多工作，但总的来说，这个过程比我发现的任何其他方法都要简单得多。

如果你不需要使用任何特定的SVN，你正在使用GitHub，你可以使用他们的SVN连接器。

更多信息在这里:在GitHub上与Subversion合作

如果您不想将在Git中所做的每个提交都提交到SVN存储库，该怎么办?如果您只想有选择地向管道发送提交，该怎么办?我有个更好的办法。

我保留了一个本地Git存储库，我所做的一切都是从SVN中获取和合并。通过这种方式，我可以确保包括所有与SVN相同的更改，但我将提交历史与SVN完全分开。

然后，我在一个单独的文件夹中保存一个单独的SVN本地工作副本。这就是我提交回SVN的文件，我只使用SVN命令行实用程序。

当我准备将本地Git存储库的状态提交到SVN时，我只需将所有乱七八糟的文件复制到本地SVN工作副本中，然后从那里使用SVN而不是Git提交它。

这样我就不需要做任何重基，因为重基就像冻结。