How to integrate DiffMerge into Eclipse (Mac)

Support for our DiffMerge utility.

Moderator: SourceGear


Posts: 1
Joined: Wed Aug 11, 2010 1:28 am
PostPosted: Wed Aug 11, 2010 2:30 am
Hi there,

intentionally I wanted to ask how I can integrate DiffMerge into Eclipse - but I figured it out now!

What you need (and what you almost should already have):

* Eclipse (also possible: AptanaIDE, ZendStudio, etc)
* Subversive feature/plugin (already included ZendStudio)


BNow, setting up an SVN project, checkout, do some things...

To set up DiffMerge correctly:
Go to Preferences -> SVN -> Diff Viewer

There "add" a new external tool. Now enter as MIME-Type "*" for every filetype. You may change this later on.

As program path enter as follow (MacOS):
/Applications/DiffMerge.app/Contents/MacOS/DiffMerge

You CANNOT browse to the binary directly, you have to write it yourself into the box. For Windows/Linux Users: Point to the executable file as usual!

The box below is for the arguments you are passing. Here you write:
${mine} ${theirs}

$mine is YOUR file locally/working copy, $theirs is the (actual) file in the repository.

For merging you set the same program path, and using this arguments:
-m ${mine} ${merged} ${theirs}

-m = for merging directly
$mine = your file
$merged = the merged file
$theirs = File in repository

You are also free to add the -tX=TEXT_HERE
Don't use " or whitespaces for the text!

Example (for diff):
-t1=My_file -t2=Repository ${mine} ${theirs}


Ok, then save, synchronize the repository, search for a file to diff -> right click -> Open in External Compare Editor

...and it should open in DiffMerge...

Note:
* Don't use " in arguments!
* If you are changing something in the preferences, you have to synchronize before you can use the new values!!
* It only works in "Team/SVN synchronization view" !

Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
PostPosted: Wed Aug 11, 2010 10:40 am
Thanks for the post. I'm not an Eclipse user, so I can't add much to your note.

But I will say that on the Mac distribution of DiffMerge, I included an optional
shell script that you can install in /usr/bin/diffmerge (or wherever) that knows
about the /Applications/DiffMerge.app/Contents/MacOS/... stuff. That might
be a little easier.

jeff

Posts: 2
Joined: Fri Feb 14, 2014 12:55 pm
PostPosted: Fri Feb 14, 2014 12:57 pm
Is there any significant difference in integrating DiffMerge on Windows?

Posts: 8550
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
PostPosted: Tue Feb 18, 2014 10:13 am
I answered in your other post: viewtopic.php?f=33&t=14765
Beth Kieler
SourceGear Technical Support

Return to Support (DiffMerge)

Who is online

Users browsing this forum: No registered users and 1 guest