简体繁体 English

与 SVN 交互合并以逐个提交合并提交

[英]Interactive merge with SVN to merge commit by commit

原文 2011-05-30 15:25:06 5 1 eclipse/ svn/ merge/ interactive

Do you know any tool that support the followings:您是否知道任何支持以下内容的工具：

eclipse integration (not mandatory) eclipse 集成（非强制性）
merge tracking合并跟踪
interactive merge交互式合并
merging with selecting changesets, but commit them one-by-one to preserve commit comments与选择变更集合并，但将它们一一提交以保留提交注释

So the flow I expect:所以我期望的流程：

picking the source to merge to workspace选择要合并到工作区的源
choosing revisions to merge选择要合并的修订
the program would do the merge for the first revision, would pop up conflict resolving if any, and if no conflict it would commit with the original commit comment + merging info with appropiate svn properties该程序将对第一个修订进行合并，如果有冲突，将弹出解决冲突，如果没有冲突，它将与原始提交注释提交 + 合并信息与适当的 svn 属性
go to next revision. go 到下一个版本。

Do you know such tool?你知道这样的工具吗？

1 个解决方案

No, I doubt any tool does this exactly as you describe - why would they when you can a) replicate the functionality by merging 1 revision at a time anyway, b) prefer to make the commit a manual process so the operator can check the merged results.不，我怀疑任何工具都完全按照您的描述执行此操作 - 为什么他们会在您可以时 a）通过一次合并 1 个修订来复制功能，b）更喜欢使提交成为手动过程，以便操作员可以检查合并结果。 Having merges commit automatically is just slightly optimistic.自动合并提交只是略微乐观。

You could write such a tool with script - for each revision, merge, fetch original log comment, commit.您可以使用脚本编写这样的工具 - 对于每个修订、合并、获取原始日志评论、提交。

Note you don't need to worry about properties as they are merged automatically as part of the merge process.请注意，您无需担心属性，因为它们会作为合并过程的一部分自动合并。