使用 Subversion 和 TortoiseSVN，如何清除本地操作历史记录？
- 我将文件的更改从分支合并到主干分支中。
- 我错误地解决了冲突，并且想从头开始，因此我将主干文件恢复到原始状态。
- 我重做步骤 1，但什么也没发生。在合并窗口中，我检查日志，我想要合并到该文件中的所有分支都呈灰色。这是 TortoiseSVN 告诉我“您已经将这些更改合并到此文件中，无需第二次”的方式。
由于没有发生任何事情，这一定是客户端问题。我尝试过清理，但没有帮助。
- I merge changes of a file from a branch into the trunk-branch.
- I wrongly resolved a conflict, and want to start from scratch, so I revert the trunk-file to it's original state.
- I redo step 1, but nothing happens. In the merge window, I check the log, all branches I want to merge into this file are grayed out. This is TortoiseSVN's way of telling me "You already merged these changes into this file, no need to do it a 2nd time."
Since nothing was comitted, this has to be client-side issue. I tried a cleanup, but it didn't help.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（3）
找到了，合并信息保存在父目录的属性svn:mergeinfo中。在 Windows XP 中，您可以使用目录的上下文菜单 -> 来访问它。属性->颠覆。我只是恢复了文件，所以TortoiseSVN没有清除这个信息。
Found it, the merge information is kept in the parent directory's property svn:mergeinfo. In Windows XP you can access this using the directory's context menu -> Properties -> Subversion. I only reverted the file, so TortoiseSVN did not clear this info.
看来您应该将该文件标记为已解决冲突。如果这没有帮助或者您无法执行此操作，请尝试删除这些资源并从 svn 重新检出它们。
It seems you should mark the file as conflict resolved. If it doesn't help or you are not available to do this, try to remove the sorces and checkout them back from svn.
您可以使用“检查修改”菜单选项查看未提交的本地更改，也可以使用“恢复”选项放弃它们。实际上，端口信息存储为一堆常规
svn:mergeinfo属性，Subversion 用它来决定修订版本是否已合并。You can review uncommitted local changes with the "Check for modifications" menu option and you can discard them with the "Revert" one. Actually, port information is stored as a bunch of regular
svn:mergeinfoproperties and that's what Subversion uses to decide whether a revision has been merged or not.