颠覆合并
我有一个主干，其中包含当前版本的代码，其中包含各种错误修复，还有一个分支，其中包含系统下一版本的各种新功能。我正在尝试将错误修复从主干合并到准备测试的分支中，但遇到了一些问题。
我正在使用 AnkhSVN 并选择“合并一系列修订”选项。提出了两个问题
- “没有未提交的修改”
- “没有切换的子项”
我没有挂起的更改。这可能是其他用户未提交更改的问题吗？
I have a trunk that contains the current release code with various bug fixes in it and a branch that contains various new features for the next release of the system. I'm trying to merge the bug fixes from the trunk into the branch ready for testing but I'm coming across some problems.
I'm using AnkhSVN and selecting the option "Merge a range of revisions". Two problems are presented
- "No uncommitted modifications"
- "No switched children"
I have no pending changes. Could this be an issue with other users having uncommitted changes?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（3）
“没有未提交的修改”通常意味着存在未决的更改。可能是切换的工作副本导致出现该消息，或者有未提交的修改不在待处理更改中。要检查此运行：
“没有切换的子级”意味着您有一个切换的工作副本，这意味着至少有一个目录“连接”到工作副本中的不同分支，而不是工作副本的根目录。要解决此问题，您必须再次将工作副本的根目录切换到分支。不幸的是 AnkhSVN 还不允许你这样做。您可以运行命令行客户端，例如：
"No uncommited modifications" usually means that there are pending changes. It could be that either the switched working copy causes the message to come up, or that there are uncommitted modifications not in Pending Changes. To check for this run:
"No switched children" means that you have a switched working copy, this means that there's at least one directory 'connected' to a different branch in the working copy than the root directory of the working copy. To fix this, you have to switch the root of the working copy to the branch again. Unfortunately AnkhSVN doesn't allow you to do this (yet). You can run the command line client something like:
桑德是对的，“没有切换子项”意味着您可能会从您试图合并的分支创建一个分支，该分支有一些阻止程序。
如果您使用 Eclipse，您可以返回到您的分支并检查“合并结果”选项卡并撤消任何不需要的合并：
[![在此处输入图像描述][1]][1]
此外，您还可以检查“SVN 树”选项卡是否存在文件夹结构上的任何冲突：
[![在此处输入图像描述][2]][2]
纠正所有不一致、冲突或任何错误的合并，然后您可以根据您的情况转到 trank，然后再次尝试合并。
[1]: https://i.sstatic.net/6kT7i.png
[2]: https://i.sstatic.net/BI0Gf.png
Sander is right, "No switched children" means you might have a branch created from the one you are trying to merge to which has some blockers.
If you use Eclipse, you can go back to your branch and check the "Merge Results" tab and undo any unwanted merge:
[![enter image description here][1]][1]
Also, you can check the "SVN Tree" tab for any conflicts on the folders structure:
[![enter image description here][2]][2]
Correct all inconsistencies, conflicts or any wrong merge, then you can go to trank, in your case, and try the merge again.
[1]: https://i.sstatic.net/6kT7i.png
[2]: https://i.sstatic.net/BI0Gf.png
一种可能性是你的工作副本是主干。
One possibility is your working copy is trunk.