how to use DiffMerge with Subversion command line client

Support for our DiffMerge utility.

Moderator: SourceGear


Posts: 2
Joined: Sat Feb 26, 2011 6:31 pm
PostPosted: Sat Feb 26, 2011 6:51 pm
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

Posts: 7308
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
PostPosted: Mon Feb 28, 2011 11:50 am
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?

Posts: 7308
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
PostPosted: Mon Feb 28, 2011 1:47 pm
Some additional posts that may help you with this can be found here:

viewtopic.php?f=33&t=11661
viewtopic.php?f=33&t=10044
http://semicrazy.wordpress.com/2009/10/ ... erge-tool/

Posts: 2
Joined: Sat Feb 26, 2011 6:31 pm
PostPosted: Fri Mar 04, 2011 2:57 pm
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

Posts: 7308
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
PostPosted: Fri Mar 04, 2011 3:40 pm
Thanks. Feel free to let us know if you have any further questions.

Posts: 2
Joined: Fri Feb 14, 2014 12:55 pm
PostPosted: Fri Feb 14, 2014 1:00 pm
Chapter 10 only covers TFS and Tortoise.
Is there any way to integrate it into Eclipse's SVN plugin for windows?

Posts: 7308
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
PostPosted: Tue Feb 18, 2014 10:12 am
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.

Posts: 1
Joined: Thu Oct 23, 2014 4:24 am
PostPosted: Thu Oct 23, 2014 4:26 am
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.
Unlock the key of your success by 117-102 latest dumps and MICROSOFT.By using our latest University of California, Berkeley and examsheets.

Posts: 7308
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
PostPosted: Thu Oct 23, 2014 8:39 am
raima55: I don't understand. Did you mean to post to this thread or a different thread?

Return to Support (DiffMerge)

Who is online

Users browsing this forum: No registered users and 1 guest