使用 TortoiseSVN 将错误修复从主干合并到功能分支的最佳实践
我的情况是，我的分支代表一个新版本，其中有一个重构的数据层，但是所有错误修复都应用于主干。
我是否以相反的方式做某事，因为我遇到的所有文档仅涉及将分支合并回主干。
我仍然想保持版本分支和错误修复同步，如何轻松完成？
特别是如果由于版本分支对其目录层次结构和文件进行了许多更改而导致冲突。
在这种情况下，最佳实践到底是什么？
I have a case where my branch represents a new version which in it there is a refactored data layer, however all of the bug fixes are applied to the trunk.
Am I doing something the oppsite way since all of the documentation that I have encountered refer only to merging a branch back into the trunk.
I would still like to keep the version branch and the bug fixes in sync, how can it be done easily?
Especially if there are conflicts due to the fact that the version branch has many changes to it's directory hierarchy and files.
What exactly is the best practice in this case?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
Subversion 知道“功能分支”的场景：
http://svnbook.red-bean.com/en/1.1/ch04s04.html#svn-ch-4-sect-4.4.2
我认为这在某种程度上适用于您的情况。我们的想法是也将更改从主干转移到分支，以便以后更容易重新集成到主干。然而，我对颠覆的经验是，这不会像你希望的那样顺利进行。其他系统，如 Git 或 Mercurial，据说在这方面做得更好。
Subversion knows the scenario of a "feature branch":
http://svnbook.red-bean.com/en/1.1/ch04s04.html#svn-ch-4-sect-4.4.2
I think this applies to some degree to your situation. The idea is there too get the changes from the trunk to the branch so that it is later easier to re-integrate to the trunk. My experience with subversion however is that this will not run as smoothly as you would like. Other systems like Git or Mercurial supposedly do a better job with something like this.
主干也是一个分支。没什么可担心的。定期、重复地将主干合并到功能分支。
众所周知，svn 的合并效果很差。这里运气不好。您必须手动更正冲突。你有一个单元测试套件，对吧？
trunkis also a branch. Nothing to fret.merge the trunk to the feature branch regularly and repetitively.
svn is known to do merging badly. No luck here. You will have to manually correct the conflicts. You have a unit testing suite, right?