SVN 工具以 git 风格对分支进行变基
是否有任何工具可以让我以 git 风格将 SVN 分支重新设置到新的父分支上？
因此，在以下情况下，我创建一个功能分支，并且有对主干的提交，
E---F---G Feature
/
A---B---C---D--H--I trunk
我正在寻找一种工具来复制主干，并一一应用提交，让我解决任何存在的冲突 - 但是每个提交都保留相同的提交消息，并且仍然是单独的提交。
E'---F'---G' Feature
/
A---B---C---D--H--I trunk
因此，提交 E' 将是与 E 具有相同更改的提交，但 E 导致冲突的情况除外，在这种情况下，E' 将与 E 不同，因为 E' 已解决冲突，并且提交消息与 E 相同 我正在寻找这个，
因为它有助于使分支与主干保持同步 - svnmerge.py / mergeinfo 方式没有帮助，因为当您合并回主干时，您仍然需要解决更改。
Are there any tools available that will let me rebase in git style an SVN branch onto a new parent?
So, in the following situation, I create a feature branch, and there are commits to the trunk
E---F---G Feature
/
A---B---C---D--H--I trunk
I'm looking for a tool which copies the trunk, and applies the commits one by one, letting me resolve any conflicts if any exist - but each commit retains the same commit message, and is still a separate commit.
E'---F'---G' Feature
/
A---B---C---D--H--I trunk
So commit E' will be a commit with the same changes as E, except in the case of E causing a conflict, in which case E' will differ from E in that E' has the conflicts resolved, and the same commit message as E.
I'm looking for this as it helps in keeping branches up to date with trunk - the svnmerge.py / mergeinfo way does not help, as you still need to resolve your changes when you merge back to trunk.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（3）
sv svn 实用程序。我从未使用过它，因为它创建了一个新分支。
There is a rebase command in the sv utility for svn. I have never used it, because it creates a new branch.
为了使分支与主干中的更改保持同步，您只需使用 svn merge 将主干合并到分支中。
In order to keep a branch up to date with the changes in the trunk, you just merge the trunk into the branch using
svn merge.我是一个长期的 SVN 用户，但是在 git 中 rebase 分支的能力，至少对我来说，似乎是它最重要的功能。不幸的是，所有光鲜亮丽的 git 营销手册似乎都把分布式存储库“功能”作为一个重要的内容 - 这对于我们的场景来说并不那么重要。
I'm a long time, heavy SVN user but the ability to rebase branches in git, to me at least, seems to be it's most important feature. Unfortunately all the glossy git marketing brochures seem to focus on the distributed repository 'feature' as the big one - which isn't that important for our scenario.