Subclipse 中的分支和合并
在阅读了我能找到的所有文章并以多种不同的方式亲自尝试之后，我对在 Subclipse 中执行分支和合并有点绝望。
我得到的只是树冲突（即使是示例项目）、错误（“文件已存在”）...
我也使用了 svn copy （这显然是比设置 < code>branch 属性）作为内置分支支持。
如何以尽可能最好的方式将一个目录分支到第二个目录？
以及如何将这些目录中的任何一个的更改合并到另一个目录？
After following all the articles I could find and trying it myself in many different ways, I'm getting a bit desperate towards performing branching and merging in Subclipse.
All I get is tree conflicts (even for example projects), errors ("file already exists")...
I've used svn copy as well (which apparently is a better practice than setting a branch property) as the built-in branch support.
How to branch a directory to a second one, in the best way possible?
And how to merge changes from any of these directiories to the other one?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
所以我想通了：
创建分支
右键单击 trunk 文件夹，选择“Team”>分支/标签。 复制到 URL： 路径必须是全新的、不存在的路径；您不能选择已经存在的路径，也不能通过对话框创建一个目录，然后选择该路径。
然后单击完成，除非您需要其他内容。
切换到分支
更新到HEAD，右键单击项目文件夹，选择Team >切换到另一个分支。单击选择...按钮。如果您刚刚创建的文件夹没有出现，请右键单击浏览器并刷新。完毕。
从主干合并到分支，反之亦然
首先，确保已安装 Collabnet 合并客户端。您会在用于获取 Subclipse 1.X 的同一目录中找到它。否则你很可能会遇到树冲突。
右键单击分支或主干，选择“团队”>“团队”合并。。如果合并是从主干到分支，请选择合并修订范围。否则选择重新集成分支。
单击下一步。选择合并源就完成了。
So I figured it out:
Creating the branch
Right-click the trunk folder, select Team > Branch/Tag. The Copy to URL: path must be an absolutely new, non-existing path; you can't either select an already existing path, or create a directory through the dialog and then choose that one.
Then click finish unless you need something else.
Switching to the branch
Update to HEAD, right-click the project folder, select Team > Switch to another Branch. Click the Select... button. If the folder you just created doesn't appear, right-click the browser and refresh. Done.
Merging from the trunk to the branch, or viceversa
First, make sure the Collabnet Merge Client is installed. You'll find it in the same directory that one uses to fetch Subclipse 1.X. Otherwise chances are you'll get tree conflicts.
Right-click either the branch or the trunk select Team > Merge. Choose Merge a range from revisions if the merge goes from the trunk to the branch. Otherwise select Reintegrate a branch.
Click Next. Select the merge source and you're done.
您应该只分支和合并整个项目。不是项目内的单个目录。它使事情变得更加简单。具体怎么做可以参考SVN的书。它很好地解释并详细介绍了常用技术：功能分支、维护分支等。
http://svnbook.red- bean.com/
You should only branch and merge the whole project. Not individual directories inside the project. It makes things much simpler. For how to do it, refer to the SVN book. It's very well explained and details the usual techniques : feature branches, maintenance branches, etc.
http://svnbook.red-bean.com/