mikeash.com pyblog/using-filemerge-with-subversion.html commentshttp://www.mikeash.com/?page=pyblog/using-filemerge-with-subversion.html#commentsmikeash.com Recent CommentsFri, 29 Mar 2024 12:03:46 GMTPyRSS2Gen-1.0.0http://blogs.law.harvard.edu/tech/rssShaun - 2012-11-07 14:24:59http://www.mikeash.com/?page=pyblog/using-filemerge-with-subversion.html#commentsSearching this topic also brought me to this: <br /> <br /><a href="http://www.defraine.net/~brunod/fmdiff/">http://www.defraine.net/~brunod/fmdiff/</a> <br /> <br />Same idea, but shell script based.4b216d743559387c4fe938e5d0a54fa1Wed, 07 Nov 2012 14:24:59 GMTKevin - 2011-09-07 16:17:42http://www.mikeash.com/?page=pyblog/using-filemerge-with-subversion.html#commentsNevemind! I figured it out. Permissions on svnopendiffshim.py need to be 777. <br /> <br />Thanks anyways!af480158ecfc48f2e8b5bba7f13a13b3Wed, 07 Sep 2011 16:17:42 GMTKevin - 2011-09-07 16:08:56http://www.mikeash.com/?page=pyblog/using-filemerge-with-subversion.html#commentsThis doesn't work for me on OS X, I get the following: <br /> <br /> <br />Index: css/debug.css <br />=================================================================== <br />exec of 'svnopendiffshim.py' failed: No such file or directorysvn: 'svnopendiffshim.py' returned 255 <br /> <br />Any thoughts?fecf9393db73739c3ce75d996bc1513dWed, 07 Sep 2011 16:08:56 GMTmsolo - 2011-05-09 22:45:51http://www.mikeash.com/?page=pyblog/using-filemerge-with-subversion.html#commentsThis is a great simple hint. Unfortunately, it's painfully slow unless you change the last line to this: <br /> <br />os.spawnlp(os.P_NOWAIT, "opendiff", "opendiff", left, right) <br />1682ca8ab4b8ea5c499f47ae71607ee2Mon, 09 May 2011 22:45:51 GMTBruno De Fraine - 2006-02-08 17:52:00http://www.mikeash.com/?page=pyblog/using-filemerge-with-subversion.html#commentsA more elaborate effort to integrate FileMerge with Subversion is available here:&lt;br /&gt; <br />&lt;a href="<a href="http://ssel.vub.ac.be/ssel/internal:fmdiff">http://ssel.vub.ac.be/ssel/internal:fmdiff</a>" rel="nofollow"&gt;<a href="http://ssel.vub.ac.be/ssel/internal:fmdi..&amp;lt">http://ssel.vub.ac.be/ssel/internal:fmdi..&lt;</a>;/a&gt; <br />685463a81b14f8f26802cfbf8586e278Wed, 08 Feb 2006 17:52:00 GMTBrian Ray - 2005-11-06 18:27:00http://www.mikeash.com/?page=pyblog/using-filemerge-with-subversion.html#commentsI meant add:&lt;br /&gt; <br />&lt;br /&gt; <br />&nbsp;&nbsp;&nbsp;&nbsp;diff-cmd = svnopendiffshiim &lt;br /&gt; <br />&lt;br /&gt; <br />&nbsp;&nbsp;&nbsp;&nbsp;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 &amp;#8221;#!/usr/bin/env python&amp;#8221;. <br />6fb28a02d3ec8fd48a5f3c0339f4f6d6Sun, 06 Nov 2005 18:27:00 GMTBrian Ray - 2005-11-06 18:23:00http://www.mikeash.com/?page=pyblog/using-filemerge-with-subversion.html#commentsBetter yet, take the svnopendiffshim and:&lt;br /&gt; <br />&lt;br /&gt; <br />&nbsp;&nbsp;&nbsp;&nbsp;$ chmod +x svnopendiffshiim&lt;br /&gt; <br />$ sudo cp svnopendiffshim /usr/bin&lt;br /&gt; <br />$ vi ~/.subversion/config&lt;br /&gt; <br />&lt;br /&gt; <br />&nbsp;&nbsp;&nbsp;&nbsp;Add:&lt;br /&gt; <br />&lt;br /&gt; <br />&nbsp;&nbsp;&nbsp;&nbsp;[helpers]&lt;br /&gt; <br />diff-cmd = svnopendiff&lt;br /&gt; <br />&lt;br /&gt; <br />&nbsp;&nbsp;&nbsp;&nbsp;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.&lt;br /&gt; <br />&lt;br /&gt; <br />&nbsp;&nbsp;&nbsp;&nbsp;$ svn diff &lt;br /&gt; <br />&lt;br /&gt; <br />&nbsp;&nbsp;&nbsp;&nbsp;Thanks for the script.&lt;br /&gt; <br />&lt;br /&gt; <br />&nbsp;&nbsp;&nbsp;&nbsp;Regards,&lt;br /&gt; <br />&lt;br /&gt; <br />&nbsp;&nbsp;&nbsp;&nbsp;Brian <br />9a2148ee6229ef19a98d07c7b4a4a796Sun, 06 Nov 2005 18:23:00 GMTbbum - 2005-08-02 06:51:00http://www.mikeash.com/?page=pyblog/using-filemerge-with-subversion.html#commentsI tossed together a python script that does the same thing (based on Mike&amp;#8217;s code, actually), but preserves the filename and version #s into the title bar of FileMerge. Not so simple and elegant as Mike&amp;#8217;s solution.&lt;br /&gt; <br />&lt;br /&gt; <br />&lt;a href="<a href="http://www.friday.com/bbum/2005/08/01/using-filemerge-with-subversion/">http://www.friday.com/bbum/2005/08/01/using-filemerge-with-subversion/</a>" rel="nofollow"&gt;<a href="http://www.friday.com/bbum/2005/08/01/us..&amp;lt">http://www.friday.com/bbum/2005/08/01/us..&lt;</a>;/a&gt; <br />fddd37f0a1d5c3f6e32a989c468dc0ebTue, 02 Aug 2005 06:51:00 GMTavium - 2005-07-09 00:36:00http://www.mikeash.com/?page=pyblog/using-filemerge-with-subversion.html#commentsyay. <br />0cf4efaff4e90a549b666cfd999f3a9aSat, 09 Jul 2005 00:36:00 GMT