Diffing against local revision of a file always compares two tempfiles

[GoogleCodeExporter]

What steps will reproduce the problem?
1. Try to diff a local revision of a file on Snow Leopard

What is the expected output? What do you see instead?
I expect to be diffing a tempfile against the local revision.  Instead, I
am diffing 2 separate files

What version of the product are you using? On what operating system?
svnx 1.1b3 on OS X 10.6

Please provide any additional information below.
I was able to fix the issue by modifying my version of the file:
/Applications/svnX.app/Contents/Resources/svnd
iff.sh.  Here's a patch that works for me:
30c30
< tmpFileFlag=`echo "$7" | sed -E 's/.*svndiff(\.[0-9]+)?\.tmp$/1/'`

---
> tmpFileFlag=`echo "$7" | sed -E 's/.*tempfile(\.[0-9]+)?\.tmp$/1/'`

I'm not sure why the temp filenames changed from 'svndiff' to 'tempfile' on
my machine...

Original issue reported on code.google.com by m...@maxcarlson.com on 5 Sep 2009 at 12:14

[GoogleCodeExporter]

What does `svn --version` report?

It looks like this got changed in Subversion 1.6.x.

I think the following may be a better fix, but I haven't fully tested it yet.

-tmpFileFlag=`echo "$7" | sed -E 's/.*svndiff(\.[0-9]+)?\.tmp$/1/'`
+tmpFileFlag=`echo "$7" | sed -E 's/.*\/(tempfile|svndiff)(\.[0-9]+)?\.tmp$/1/'`

Let me know if it works for you.

Original comment by chris...@gmail.com on 5 Sep 2009 at 1:47

• Changed state: Accepted
• Added labels: ****
• Removed labels: ****

[GoogleCodeExporter]

Yes, that should work fine.  I'm running subversion 1.6.5 now.  Thanks!

Original comment by m...@maxcarlson.com on 5 Sep 2009 at 10:18

• Added labels: ****
• Removed labels: ****

[GoogleCodeExporter]

Fixed in r122.

Original comment by chris...@gmail.com on 21 Sep 2009 at 4:37

• Changed state: Fixed
• Added labels: ****
• Removed labels: ****