我想知道这里是否有人对在Ubuntu上运行Mercurial有任何经验?我整个上午都在玩它,并且喜欢到目前为止我所看到的一切.
I wonder if anyone here has any experience with mercurial running on Ubuntu? I've been playing with it all morning and love everything I've seen so far.
我遇到的一个问题是,当我执行合并并检测到冲突时,它不会自动在命令行编辑器中调出文件来解决冲突.它只是告诉我存在冲突,然后由我决定打开编辑器并解决它.
The one problem I though is when I do a merge and conflicts are detected, it doesn't automatically bring the file up in the command line editor to allow me to resolve the conflicts. It just tells me there's a conflict, then it's up to me to open the editor and resolve it.
但是,这很奇怪,因为文档显示在发生合并冲突时会自动启动编辑器.我知道一般来说,编辑器(nano)都不是问题,因为当我进行提交并必须添加评论时,它就可以工作了.
But this is strange as the docs show that the editor is automatically launched when there is a merge conflict. I know it's not a problem with the editor (nano) in general as it's works when I do a commit and have to add a comment.
有什么想法吗?
克里斯
p.s我已经尝试了水银IRC频道,但保持沉默....
p.s I already tried the mercurial IRC channel, but silence....
推荐答案您可能需要在〜/.hgrc中定义合并工具:
You probably need to define your merge tool in ~/.hgrc:
[ui] merge = vimdiff更多推荐
Mercurial:检测到合并冲突时不显示编辑器
发布评论