5

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.

MdaG
  • 2,680
  • 2
  • 34
  • 46
  • Do you mean THE "Mercurial plugin" by Vectrace? Looking at its latest source (utils/CompareUtils.java), there doesn't seem to be a way. There's only an option to use external tool to resolve conflict. You could hack the plugin, or hack the Beyond CVS plugin (http://sourceforge.net/projects/beyondcvs/) to use hg. – Geoffrey Zheng Aug 30 '10 at 17:17
  • Sorry I meant MercurialEclipse. I've set the option for using external tools for handling merge conflicts (and it does), but whenever I try to diff files through Eclipse the builtin tool is executed. Hack the plugin is an option, but I'm not sure where to begin. Didn't even know it was open source. :-) – MdaG Aug 30 '10 at 21:31

2 Answers2

1

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

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.

[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.

pyfunc
  • 65,343
  • 15
  • 148
  • 136
  • The plugin settings only allows me to use an external tool for resolving conflicts not regular two-way diff. However setting up the hgrc might work, even though I've failded so far. :-) Scooter software has a setup here (http://www.scootersoftware.com/support.php?c=kb_vcs.php) that doesn't work for me. – MdaG Dec 02 '10 at 07:46
  • @MdaG: If you want to use external diff tool. I would suggest that instead configure your command line to use the external diff. It will at least help you to overcome the limitation of MercurialEclipse. – pyfunc Dec 02 '10 at 07:52
  • I currently use TortoiseHg which boots up BC when I want to compare files and it works fine. I'll check out the ExtDiffExtension for the command line. :-) But I take it MercurialEclipse doesn't support external tools for diffing at the time of writing this. – MdaG Dec 02 '10 at 09:13
  • @MdaG: Yes. So far my exploration has yielded no way of doing that. But I have always preferred the command line way of setting up so it had not been a issue with me. – pyfunc Dec 02 '10 at 21:51
0

You need to install Beyond Compare Eclipse Plugin (Beyond CVS) which would provide this functionality.

Cheers!!!

bhagyas
  • 3,050
  • 1
  • 23
  • 21