如何在Linux上使用外部合并工具与svn配合使用? [英] How to get external merge tools to work with svn on linux?

问题描述

如何获取基于GUI的合并工具以在Linux中与命令行SVN一起使用?我知道那里有很多选择，例如meld，svn Diff等.所有这些都需要一个帮助程序脚本，以允许svn在解决冲突期间调用外部程序.我按照此处和漂亮的 svn手册(带有融合).

How do I get a GUI-based merge tool to work with command line SVN in linux? I understand that there are many options like meld, svn Diff, etc. out there. All of them require a helper script to allow svn to invoke the external program during conflict resolution. I followed the instructions given here and the nice svn manual with meld.

但是在所有情况下，当我遇到合并冲突并键入'l'来调用外部工具时，都会出现错误:外部合并工具退出，退出代码为255

But in all cases, when I get to the merge conflict and type 'l' to invoke the external tool, I get an error: The external merge tool exited with exit code 255

我敢肯定，我在这里遗漏了一些关键的东西.对于太多不同的解决方案来说，IT太巧合了.将不胜感激任何解决方案或对该问题的指示.

I'm fairly certain I'm missing some key thing here. ITs too much of a coincidence for so many different solutions to fail. Would appreciate any solution or pointers to the problem.

谢谢！

推荐答案

还要确保配置中的路径是绝对路径.从该目录运行pwd命令时，该路径应与您看到的路径相同.没有别名或相对路径.因此，如果您的用户名是foo，您将替换以下行:

Also make sure that the path in your config is absolute. It should be the same path you see when you run a pwd command from that directory. No aliases or relative paths. So if your username is foo you would replace this line:

在其下面添加此内容: merge-tool-cmd =〜/bin/svn-merge-meld

Add this below it: merge-tool-cmd = ~/bin/svn-merge-meld

使用

在其下面添加此内容: merge-tool-cmd =/Users/foo/bin/svn-merge-meld

Add this below it: merge-tool-cmd = /Users/foo/bin/svn-merge-meld

这篇关于如何在Linux上使用外部合并工具与svn配合使用?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！