我可以使用 Subversion 合并跟踪从分支重复合并到主干吗？
我们发布了1.0版本，并在主干中继续开发2.0。我们创建了 Branches/1.0 来修复与已发布版本相关的错误。
计划是：
- 2.0在trunk/ trunk/中继续开发
- ，包含不会合并到branches/1.0中的新功能，因此trunk永远不会合并到branches/1.0中。
- 在发布的应用程序中发现错误时，会在branches/中进行修复1.0。当一个修复集发布到生产中时，branches/1.0 被复制到tags/1.0.x，并且branches/1.0 被合并到 trunk/
- 想法是 subversion 合并跟踪应该跟踪更改，以便当我们合并 1.0.x 时。 4 个主干修复，1.0.3 修复被自动跳过
这种方法有什么问题吗？ Subversion 合并跟踪会跟踪更改吗？我还没有在实践中尝试过这一点，并且大多数示例都以不同的方式执行此操作（从主干合并到分支，这是我不想要的，因为大多数 2.0 开发在 1.0 修复中不需要）。合并重新整合是否适合这个？
We released version 1.0 and continue developing 2.0 in trunk. We created branches/1.0 for bug fixes related to the released version.
Plan is:
- 2.0 development continues in trunk/
- trunk/ contains new features that are not to be merged into branches/1.0, so trunk is not merged into branches/1.0 ever
- When bugs are found in the released application, fixes are made into branches/1.0. When a fix set is released into production, branches/1.0 is copied to tags/1.0.x, and branches/1.0 is merged into trunk/
- Idea is that subversion merge tracking should keep track of the changes, so that when we merge 1.0.4 fixes to trunk, 1.0.3 fixes are automatically skipped
Are there any problems with this approach? Will subversion merge tracking keep track of the changes OK? I haven't tried this in practise yet, and most examples do this differently (merging from trunk to branch, which I do not want, as most 2.0 development is not wanted in 1.0 fixes). Does merge-reintegrate fit into this somehow?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
是的，这正是它的设计目的。由于 trunk 上的 svn:mergeinfo 属性正在跟踪 1.0 中的哪些修复已合并回来，因此第二次运行合并不会导致它再次获取这些修订。
合并前跟踪，您必须跟踪您合并的修订，并确保您不会尝试再次合并它们。现在合并脚本更加清晰。
Yes, this is exactly what it is designed for. Since the
svn:mergeinfoproperty on trunk is keeping track of which fixes from 1.0 have been merged back, running the merge a second time will not result in it grabbing those revisions again.Pre-merge-tracking, you would have to keep track of which revisions you merged, and make sure you don't attempt to merge them a second time. Now merging scripts are much cleaner.