AnkhSVN 合并向导在“完成”时不执行“重新集成分支”操作。
尝试从分支合并回主干。这两个项目都是“干净的”。
当我单击合并向导中的最后一个“完成”按钮时，它会稍微搅拌一下（SVN 窗口“正在合并 - 请稍候...”），然后返回到合并向导，底层待定更改窗口中没有任何内容。我可以一遍又一遍地单击“完成”，但看不到任何变化。
我原以为我的分支现在的更改会更新到我的主干 - 或者至少会发生一些事情，但我找不到发生的任何事情。
还有其他地方可以查找我丢失的错误/状态更新吗？
Trying to do a merge from a branch back into the trunk. Both projects are "clean."
When I click the final "Finish" button in the Merge Wizard it churns for a bit (SVN window "Merging - please wait...") and then it goes back to the Merge Wizard without anything in the underlying Pending changes window. I can click finish over and over and see no change.
I was expecting the changes from my branch to now be updates to my trunk - or at least SOMETHING to happen, but I can't find anything that has happened.
Is there somewhere else to look for an error/status update that I'm missing?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
“答案”中列出的错误意味着您应该在重新集成之前将 7-41 从主干合并到分支。您的分支应包含主干中的所有更改，然后才能重新集成它
The error listed in your "answer" means that you should merge 7-41 from trunk to the branch before reintegrating. Your branch should contain all changes from trunk before you can reintegrate it
很确定问题是我从来没有正确地分支（大约一年前......现在不知道它是如何下降的）。
我在 Windows 中尝试使用 TortisSVN 进行重新集成操作时收到错误消息。错误是：
所以我可能会复制代码并进行签入，而不依赖于该分支存在的正确分支/合并历史记录
Pretty sure the problem was that I never correctly branched in the first place (about a year ago... not sure now how it went down).
I was able to get an error message by attempting the reintegration operation with TortisSVN in windows. The error is:
So I'll probably copy the code and do a checkin and not depend on correct branch/merge history to exist for this branch