开发者

bazaar 2.4 external merge tool

开发者 https://www.devze.com 2023-04-03 18:57 出处:网络
i installed the latest stable bzr version and gladly discover the external merge feature. but i can开发者_JS百科t get it to work

i installed the latest stable bzr version and gladly discover the external merge feature. but i can开发者_JS百科t get it to work

i'm using bcompare as my tool , and no matter what i do , when i try to resolve conflicts i choose bcompare and it always state "External merge tool bcompare is not available"

i tried with and without putting the bcomapre directory in PATH with no luck. i also tried it outside of gui and directly in bazaar conf with the following lines:

[MERGE]

bzr.mergetool.bcompare = bcompare.exe {this} {other} {base} {result}

bzr.default_mergetool = bcompare

please help me Gil Idelson


The message "External merge tool bcompare is not available" means that it is not able to find the executable either directly or on the PATH. You can try putting the full path to bcompare.exe in the merge tool definition. If there are spaces in the path, enclose it in quotes. If you do so, please be aware that there is a known bug in qconfig when editing merge tool definitions that include quotes.

If you are adding the BCompare directory to your PATH, make sure that you restart the command window that you are invoking qconflicts from, to pick up the change to the system PATH.

If you are still having trouble, please file a bug with the Bazaar project.

0

精彩评论

暂无评论...
验证码 换一张
取 消

关注公众号