撤消合并标记
我使用 Eclipse Indigo 和 subeclipse 作为 eclipse 的 svn 插件。现在的情况是这样的。我正在将我的项目与远程存储库同步。存在冲突，我错误地单击了其中一个文件的“标记为合并”，而没有合并它。我尝试重新启动 eclipse 和其他一些愚蠢的黑客。但没有任何结果。那么有没有办法撤消“标记为合并”操作？
I am using Eclipse Indigo and subeclipse as the svn plugin for eclipse. Now here is the situation. I was synchronizing my project with the remote repository. There were conflicts present and I mistakenly clicked on "mark as merged" for one of the files without merging it. I tried restarting eclipse and some other stupid hacks. But nothing works out. So is there a way to undo "mark as merged" action?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（3）
标记为已合并意味着在比较文件并手动解决问题后，文件的本地版本包含您想要的内容。 Subclipse 仍然需要更新本地文件，以便 SVN 的元数据满意，因此它保存文件的当前内容，运行 svn update，然后替换该文件。
所以你现在可以运行 Team >如果您希望文件与存储库中的内容匹配，请恢复，或者与>比较如果您只想再次检查差异并可能进行更多更改，请进行基本修订。
Mark as Merged means that the local version of the file contains the content you want, after having compared the files and manually resolving issues. Subclipse still has to update the local file so that SVN's metadata is happy, so it saves the current content of the file, runs svn update, and then replaces the file.
So you can now run Team > Revert if you want the file to match what was in the repository, or Compare with > Base Revision if you just want to examine the differences again and possibly make more changes.
马克的建议对我来说都不起作用。该类确实恢复到原始（合并前）状态，但尝试再次合并只会给我一条“未检测到差异”的消息。
最终对我有用的是比较 >当地历史。我能够在点击“标记为合并”之前选择一个版本，这让我回到了原始合并期间的“比较编辑器”视图（显示了所有冲突）。然后我能够正确更改代码，并再次标记为合并。
Neither of Marks suggestions worked for me. The class did revert back to the original (pre-merged) state, but trying to Merge again just gave me a 'no differences detected' message.
What did end up working for me was to Compare With > Local History. I was able to pick a version that was right before I hit Mark As Merged, and that got me back to the Compare Editor view that I had during the original Merge (which showed all the conflicts). I was then able to change the code correctly, and Mark As Merged again.
删除本地项目并重新导入它，这可以撤消意外的“标记为合并”操作。只需确保删除不会导致未提交的工作丢失。
Delete the local project and re-import it, and this has the effect of undoing an accidental 'Mark as Merged' action. Just make sure that the deletion won't result in loss of uncommitted work.