mikeash.com pyblog/using-filemerge-with-subversion.html comments

Shaun - 2012-11-07 14:24:59

Wed, 07 Nov 2012 14:24:59 GMT

Searching this topic also brought me to this:

http://www.defraine.net/~brunod/fmdiff/

Same idea, but shell script based.

Kevin - 2011-09-07 16:17:42

Wed, 07 Sep 2011 16:17:42 GMT

Nevemind! I figured it out. Permissions on svnopendiffshim.py need to be 777.

Thanks anyways!

Kevin - 2011-09-07 16:08:56

Wed, 07 Sep 2011 16:08:56 GMT

This doesn't work for me on OS X, I get the following:

Index: css/debug.css
===================================================================
exec of 'svnopendiffshim.py' failed: No such file or directorysvn: 'svnopendiffshim.py' returned 255

Any thoughts?

msolo - 2011-05-09 22:45:51

Mon, 09 May 2011 22:45:51 GMT

This is a great simple hint. Unfortunately, it's painfully slow unless you change the last line to this:

os.spawnlp(os.P_NOWAIT, "opendiff", "opendiff", left, right)

Bruno De Fraine - 2006-02-08 17:52:00

Wed, 08 Feb 2006 17:52:00 GMT

A more elaborate effort to integrate FileMerge with Subversion is available here: 
<a href="http://ssel.vub.ac.be/ssel/internal:fmdiff" rel="nofollow">http://ssel.vub.ac.be/ssel/internal:fmdi..<;/a>

Brian Ray - 2005-11-06 18:27:00

Sun, 06 Nov 2005 18:27:00 GMT

I meant add: 
 
diff-cmd = svnopendiffshiim 
 
Or whatever you name the script you put in /usr/bin. On that note, you do not need the .py extension. Also you may want to make the header on your python script ”#!/usr/bin/env python”.

Brian Ray - 2005-11-06 18:23:00

Sun, 06 Nov 2005 18:23:00 GMT

Better yet, take the svnopendiffshim and: 
 
 $ chmod +x svnopendiffshiim 
$ sudo cp svnopendiffshim /usr/bin 
$ vi ~/.subversion/config 
 
 Add: 
 
 [helpers] 
diff-cmd = svnopendiff 
 
 This much easier and does not require and difference in how you call svn diff nor will you need to mess with you enviroment settings. 
 
 $ svn diff 
 
 Thanks for the script. 
 
 Regards, 
 
 Brian

bbum - 2005-08-02 06:51:00

Tue, 02 Aug 2005 06:51:00 GMT

I tossed together a python script that does the same thing (based on Mike’s code, actually), but preserves the filename and version #s into the title bar of FileMerge. Not so simple and elegant as Mike’s solution. 
 
<a href="http://www.friday.com/bbum/2005/08/01/using-filemerge-with-subversion/" rel="nofollow">http://www.friday.com/bbum/2005/08/01/us..<;/a>

avium - 2005-07-09 00:36:00

Sat, 09 Jul 2005 00:36:00 GMT

yay.