diffmerge and subversion integration

Support for our DiffMerge utility.

Moderator: SourceGear

Post Reply
olek
Posts: 12
Joined: Thu Apr 10, 2008 9:38 am

diffmerge and subversion integration

Post by olek » Thu Apr 10, 2008 3:20 pm

Here is my solution for integration between diffmerge and subversion.

I created a wrapper script that provides command line interface that subversion expects, and converts it to diffmerge command line, with some nice additions.

As a starting point for this script I used somebody's else script that was integrating with kdiff3 or some other tool, and than heavily modified it until it was different implementation of the same idea.

Ok, to use it you will have to modify file ~/.subversion/config, you will see there 2 entries for 2-way diff and 3-way diff, mention same wrapper script for both.

Script was tested to work on Ubuntu 7.04 Fiesty and 7.10 Gutsy.
I just started to use it with Mac OS X 10.5 Leopard and it seems to work fine.
Windows users, of course, are out of luck, but maybe with cygwin and good dose of magic this will work too.

Hope that this script will be useful to others just as it is useful for me.

Usual disclaimer: this script is a work in progress and there is some chance that it may set your computer on fire. Take your chances :P
Attachments
diffmerge-svn-wrapper.sh.txt
(6.59 KiB) Downloaded 975 times

jeffhostetler
Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
Contact:

Thanks for the script.

Post by jeffhostetler » Fri Apr 11, 2008 8:19 am

Thanks for the script.
jeff

Post Reply