Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Beyond Compare as default diff tool in Eclipse when using Mercurial?

Is there any way to make Beyond Compare 3 the default diff tool in Eclipse? I'm using the Mercurial plugin and would like to use BC3 for diffing files and handling merge conflicts. I'm only able to find solutions when it comes to CVS or SVN when searching this site.

like image 470
MdaG Avatar asked Nov 14 '22 08:11

MdaG


1 Answers

See the following query for discussion on external diff tool for Mercurial Eclipse.

  • http://bitbucket.org/mercurialeclipse/main/issue/310/external-diff-tool

It suggests that standard approach for setting up external diff tool should suffice. So setting up ".hgrc" should work.

Since this is no different from any other setup, you can test it by using hg commands in shell. See if that throws any errors and then check out with eclipse.

The setting for external merge tool is available in the plugin settings.

  • http://bitbucket.org/mercurialeclipse/main/wiki/Installation_and_Configuration#main-preferences

[edit: with hgrc]

This will work when you use command line.

The following "ExtdiffExtension" extension should help.

The extdiff Mercurial extension allows you to use external programs to compare revisions, or revision with working dir. The external diff programs are called with a configurable set of options and two non-option arguments: paths to directories containing snapshots of files to compare.

like image 78
pyfunc Avatar answered Dec 30 '22 19:12

pyfunc