在 Subversion 中将功能分支与主干合并并将其重新集成回主干时，如何处理删除和重命名/移动的文件？
我有一个大型项目，需要在新功能上进行大量工作，因此我计划使用分支来完成这项工作。我以前从未这样做过，我只是想从经验丰富的 Subversion 用户那里得到保证，事情“应该”顺利进行。
我特别关心的是 Subversion 处理分支和主干之间删除、重命名/移动的文件的效果如何。也就是说，如果在分支中删除或重命名/移动多个文件，但这些文件继续使用并在主干中接收更改，则与主干的合并仍会顺利进行（当然，根据需要重新处理分支） ）？
另外，当我将分支与主干重新集成时，如果主干和分支之间的文件名称（或存在）差异很大，重新集成会很困难吗？分支中删除（移动）的文件现在会在主干中删除（移动），还是文件会滞留并出现冲突？
SVN 书没有为我解答这些问题，因此非常感谢您的经验。谢谢你！
I've got a big-ish project that needs a lot of work on a new feature, so I planned on using a branch to do this work. I haven't had to do this before, and I just wanted to get assurance from an experienced Subversion user that things "should" work smoothly.
What I'm especially concerned with is how well Subversion handles deleted, renamed/moved files between a branch and the trunk. That is, if multiple files are deleted or renamed/moved in the branch, but those files continue to be used and receive changes in the trunk, will merges with the trunk still proceed without a hitch (reworking the branch, of course, as necessary)?
Also, when I then reintegrate the branch with the trunk, if the files differ greatly in name (or existence) between the trunk and branch, will the reintegration be difficult? Will the files deleted (moved) in the branch now be deleted (moved) in the trunk, or will files linger and conflicts emerge?
The SVN book didn't clear up these questions for me, so your experience would be greatly appreciated. Thank you!
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
http://markphip.blogspot.com/2006/12/subversion- moverename-feature.html
重命名是复制/删除
如果重命名发生在 1 个分支上，并在第 2 个分支上进行编辑，则它们将需要手动合并
您想要发生的神奇重命名内容不会在颠覆中发生，但会发生在 Git 中。
http://markphip.blogspot.com/2006/12/subversion-moverename-feature.html
Rename is a copy / delete
If a rename happens on 1 branch, and edits on a 2nd branch, they will require a hand merge
The magic rename stuff you want to happen will NOT happen on subversion, but WILL happen in Git.