如何使用 TortoiseSVN 将删除的修订合并到主干中
我正在使用 TortoiseSVN。一位开发人员同事最近从我们的主干分支中删除了我的几个修订，我需要知道如何恢复它们。如果我查看主干上的历史记录，则不存在修订。如果我查看整个存储库的历史记录，我可以看到我的修订。如何将这些修订版本放回到主干中？
I'm using TortoiseSVN. A fellow developer recently deleted several of my revisions from our trunk branch and I need to know how to restore them. If I view the history on trunk, the revisions are not there. If I view the history on the entire repository, I can see my revisions. How do I get these revisions back into trunk?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
SVN 中没有删除修订版本。您只能恢复修订并创建新的提交。所以我觉得很奇怪，你在 Trunk 中找不到你的修订版本。因此，如果您在查看整个存储库的日志时看到它们，则意味着修订从未在主干中，而仅在其他分支中。
如果您错误地“没有看到主干上的修订”部分，并且修订就在那里，您可以恢复恢复您的提交。如果它们仅在某个其他分支中并在该分支中恢复，您仍然可以选择修订（后来恢复）并合并到主干中。
There is no deleting revisions in SVN. You can only revert revisions and that creates new commit(s). So I find it weird that you don't find your revisions in Trunk. So if you are seeing them when you are viewing the log of the entire repo, that means the revisions were never in trunk, but only in some other branch.
If you had mistaken the "not seeing the revisions on trunk" part and the revisions are there, you can revert the commit which reverted yours. If they are only in some other branch and reverted in that branch, you can still choose the revisions ( that were later reverted ) and merge into trunk.
只是为了补充之前的答案：
然后您应该看到丢失的内容并能够检查将其取出并在必要时以正常方式重新合并。
Just to augment the previous answer:
You should then see the missing stuff and be able to check it out and remerge if necessary in the normal way.