how to use DiffMerge with Subversion command line client

[olaoni]

Hi All,

I stumbled across DiffMerge while searching for a tool that I can use as an external diff program with subversion command line client. I am interested in programs that is supported on both Windows and Ubuntu OS.

I currently use kdiff3 and to invoke the diff command I type ..

c:\my_dir>svn diff --diff-cmd kdiff3 my_file.c

Question what will the equivalent command be for DiffMerge, as I like the look of this tool. Many thanks in advance.

Regards
Ola

[Beth]

We have setting up the configuration documented in our manual, http://download-us.sourcegear.com/DiffM ... Manual.pdf, under Chapter 10: Integration with Third Party Software. Did you set up that part already?

[Beth]

Some additional posts that may help you with this can be found here:

http://support.sourcegear.com/viewtopic ... 33&t=11661
http://support.sourcegear.com/viewtopic ... 33&t=10044
http://semicrazy.wordpress.com/2009/10/ ... erge-tool/

[olaoni]

Hi Beth,

Apologises for the silence. I have been very busy and had to park looking for another diff program for now. I had a look at the links you suggested (not in details) and I noticed that the example given were for a linux os.
I also looked at the manual.

When I have a bit more free time on my hands I will try and learn a bit more on the tool. At this junction I just thought it will be appropriate to acknowledge your response since you took out time to write the response not once but twice.

So thank you.

I will be back in a few weeks and will probably have more to say or input.

Regards

Ola

[Beth]

Thanks. Feel free to let us know if you have any further questions.

[blawson7]

Chapter 10 only covers TFS and Tortoise.
Is there any way to integrate it into Eclipse's SVN plugin for windows?

[Beth]

In Eclipse, go to Window - Preferences. There should be an entry for SVN under preferences. Under the SVN area, they probably have an area to configure a Diff tool. Then you should be able to enter the same data presented in the article.

[raima55]

It was happening after launching with "git mergetool", but today when I tried to reproduce it, I couldn't. No idea what was going on. If this happens again, I'll revisit it. Thanks for looking into this.

[Beth]

raima55: I don't understand. Did you mean to post to this thread or a different thread?