用于有选择地撤消对 SVN 管理的文件所做的更改的工具
我需要有选择地恢复一个大文件中的几行(具体来说,Xcode 更改了项目文件中的一些设置,我需要在提交之前恢复这些设置)。有人告诉我有一个工具可以交互式地逐个比较文件,并允许您进行更改。
我认为它被称为 svn-view-diffs 但我找不到任何参考。
我怎样才能完成这个任务?
谢谢
I need to selectively revert a few lines in a massive file (to be specific, Xcode changed some settings in a project file that I need to revert before committing). I was told there is a tool that will interactively go through the file, diff by diff, and allow you to make changes.
I think it was called svn-view-diffs but I can't find any reference to it.
How may I accomplish this task?
thanks
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(3)
这里有一些“合并”工具的选择,所有这些也用于显示文件之间的差异。大多数允许您通过直接编辑或单击差异来编辑工具内的一个文件。
Here's a few choices for 'merge' tools, all of which are also used for showing differences between files. Most allow you to edit one file inside the tool, either by editing directly or clicking on differences.
像 Finder 的 SCPlugin 这样的东西将能够帮助您。
不过,为了查看差异的确切目的,有 Diffly 这并不是一个真正成熟的 SVN 客户端,但适合您的需求。
我认为 SVNX 是 SVN 最流行的 Mac OS 客户端,它具有 FileMerge集成
只需查看这些工具或搜索 Mac OS diff 或 SVN 客户端即可。周围有很多,我认为也应该与 Xcode 进行一些集成。
Something like SCPlugin for Finder will be able to help you
For the exact purpose of seeing diffs though, there is Diffly which is not really a full blown SVN client but will be suitable for what you want.
I think SVNX is the most popular Mac OS client for SVN and it has FileMerge integration
Just look at these tools or search for Mac OS diff or SVN client. There are quite a few around and I think there should be some integration with Xcode as well.
我使用了名为 svn-view 的工具,它的工作方式类似于 CVS 视图和 Web 模块。我刚刚发现可以下载网络模块: http:// /public.e-tunity.com/web-svn-view/web-svn-view.html
同时,Atlassian 工具也可用于此目的。如果您可以使用Windows环境下的TortoiseSVN客户端也可以帮助您做到这一点。您也可以浏览存储库并查看每个文件的更改。 http://tortoisesvn.tigris.org/
I have used tool called svn-view which works similar to CVS view and web module. And i just found web module can be downloaded : http://public.e-tunity.com/web-svn-view/web-svn-view.html
In mean time, Atlassian tools also avialble for that. If you can use Windows environment TortoiseSVN client also help you do that. You can browse repository and see the changes for each files too. http://tortoisesvn.tigris.org/