After upgrading to Subversion 1.4, using "FileMerge?" on a working copy seemingly randomly fails -- FileMerge? will sometimes not launch or display a dialog complaining that it cannot compare the files. The problem seems to stem from a change in the handling of the tmp copy that svn diff occasisonaly provides instead of the actual local file. The tmp files are now placed in the system tmp directory and are formatted as so:
svndiff.tmp
svndiff.2.tmp
svndiff.3.tmp
...
This causes the filename mangling svndiff.sh performs to get the path to the actual working copy file to fail.
I've produced a patch against the svnX trunk (r37), that I seems to fix this problem, as well as a cosmetic issue with the extension added to svnx-opendiff tmp files.
I think the patch should also fallback seamlessly to the Subversion 1.3 behaviour, but I have not be able to test this locally due to the Subversion 1.3 -> 1.4 repository format changes.
% uname -a
Darwin mame.local 8.8.0 Darwin Kernel Version 8.8.0: Fri Sep 8 17:18:57 PDT 2006; root:xnu-792.12.6.obj~1/RELEASE_PPC Power Macintosh powerpc
% svn --version
svn, version 1.4.2 (r22196)
compiled Nov 15 2006, 03:10:50
% svn info svnx/trunk
...
Revision: 37
...
