SVN分支问题
我的项目 X 中有一个 /Trunk。在版本 69 上,我们必须恢复三个早期版本 (61、63、64) 中的更改。
我所做的是对修订版 61、63、64 进行反向合并,并将其提交到修订版 69。然后我们可以再次部署,每个人都很高兴。
现在我们了解到,在单独的分支中开发新功能是一个好主意,然后主干随时准备部署到生产环境(并对当前版本进行修补程序)。
所以现在我已经从 /Trunk 中的 HEAD 修订版(修订版 69)制作了“/Branches/X”(修订版 70),但我想保留我在 /Trunk 中撤消的更改(61,63 ,64)
正确的方法是什么?
顺便说一句,我说清楚了吗? :)
I have a /Trunk in my Project X. On rev 69 we had to revert changes in three earlier revisions (61,63,64).
What I did was a reverse merge on the revisions 61,63,64 and committed this to rev 69. Then we could deploy again and everyone was happy.
Now we have learned that developing new features in a separate branch is a neat idea, and then the Trunk is always ready to deploy to production (and doing hotfixes on current release).
So now I have made a "/Branches/X"(rev 70) from the HEAD revision in the /Trunk (which is rev 69), but I want to have with me the changes I undid in the /Trunk (61,63,64)
What is the correct way to this?
btw, have I made meself clear about? :)
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(3)
首先,请注意拼写检查器:
trunk
和branches
通常都是小写。也就是说,您应该删除分支并从修订版 68 重新创建它。这里我假设修订版 68 包含修订版的所有更改。 61,63,64 没有你不想要的。
我相信您已经意识到,如果没有Subversion 书,您就走不远。
First of all, watch your spell-checker:
trunk
andbranches
are conventionally all lower-case. That said, you should remove your branch and recreate it from revision 68.Here I'm assuming that revision 68 contains all changes from revs. 61,63,64 and nothing you do not want.
I'm sure you already realized that you can't go far without the Subversion book.
您可以再次将它们合并到分支:
You can just merge them again, now to the branch:
一般来说,假设您想要将一些变更集从分支 X 合并到分支 Y。使用 TortoiseSVN 执行以下步骤:
Generally speaking, suppose that you want to merge some change-sets from branch X to branch Y. do the following steps using TortoiseSVN: