将 Subversion 分支合并回主干并保留修订版本
我的颠覆项目有一个分支，用于开发该产品的主要新版本。现在该产品已经推出，是时候将该分支合并回卡车中了。
我正在使用 VisualSVN 和 TortoiseSVN 来与 SVN 服务器配合使用。
根据TortoiseSVN文档，该过程似乎是：
a.检查主干到工作 复制。
b.运行合并命令以应用 分支更改到工作副本。我已经尝试过 TortoiseSVN 中的合并对话框并从命令行尝试：
svn merge --reintegrate https://domain.com/project/branches/example< /a>c.将工作副本提交回 树干。
虽然此过程将导致主干拥有所有最新代码，但这也意味着我丢失了分支中的所有修订。这是不可接受的。我希望能够看到开发过程中的进度，并保留所有签入评论。
一定有更好的方法来完成这种合并，对吧？
My subversion project has a branch that's been used to develop a major new release of the product. Now that the product has been launched, it's time to merge that branch back in to the Truck.
I'm using VisualSVN and TortoiseSVN to work with the SVN Server.
Based on the TortoiseSVN documentation, the process seems to be:
a. Check Out the Trunk to a Working
Copy.b. Run the Merge command to apply the
Branch changes to the Working Copy. I've tried the Merge Dialog in TortoiseSVN and this attempt from the command line:
svn merge --reintegrate https://domain.com/project/branches/examplec. Commit the Working Copy back to
the Trunk.
While this process will result in the Trunk having all of the latest code, it also means that I lose all of the revisions in the Branch. That's not acceptable. I want to be able to see the progress during development, and keep all of the check-in comments.
There must be a better way to accomplish this merge, right?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
较新版本的 SVN 和 Tortoise SVN (1.5+) 具有合并跟踪功能；这允许 Tortoise SVN 显示分支的修订。在 Tortoise SVN 日志消息窗口中，如果您选中“包括合并修订”，您将能够看到对分支所做的所有提交。
Newer versions of SVN and Tortoise SVN (1.5+) have a merge tracking feature; this allows Tortoise SVN to display revisions from branches. In the Tortoise SVN Log Message window, if you check "Include merged revisions" you will be able to see all of the commits that were made to the branch.