My favorites | Sign in
Project Logo
Project hosting will be READ-ONLY Wednesday at 8am PST due to brief network maintenance.
                
New issue | Search
for
| Advanced search | Search tips
Issue 57: Diff broken in Mac OS X 10.6 Snow Leopard
7 people starred this issue and may be notified of changes. Back to list
Status:  Invalid
Owner:  chr...@lavabit.com
Closed:  Sep 01
Type-Defect
Priority-Medium


Sign in to add a comment
 
Reported by mark.appleman, Sep 01, 2009
What steps will reproduce the problem?
1. Install/upgrade to Mac OS X 10.6 Snow Leopard
2. Open a Working Copy window.
3. Select any text file (not binary) with a history.
4. Click on the Diff button in the toolbar.

What is the expected output? What do you see instead?
Expected FileMerge to launch and display diff. Instead, nothing happens. Repeated test with 
FileMerge, BBEdit set as Diff application in SvnX preferences

What version of the product are you using? On what operating system?
SvnX 1.0, Mac OS X 10.6


Please provide any additional information below.
Feature was working in Mac OS X 10.5.x

Comment 1 by mark.appleman, Sep 01, 2009
Issue also applies to SvnX 1.1b3
Comment 2 by chr...@lavabit.com, Sep 01, 2009
Presumably this is a file with local changes in the working copy, and this worked OK on 10.5.x?
I don't know if it's necessary, but did you reinstall the developer tools and/or the BBEdit CLI tools?
Also, if you open the log drawer in the Activity window does it show any info (after clicking Diff)?
Finally, does the Console app display any (relevant) info?
Owner: chr...@lavabit.com
Comment 3 by mark.appleman, Sep 01, 2009
Update: Running the XCode Tools installer fixes the problem.

See below for details. Hopefully this will help others who encounter the same issue.

> Presumably this is a file with local changes in the working copy, and this worked OK on 10.5.x?
This was originally reported to me by a coworker. I verified on my local working copy. But, by mistake, I tried to Diff a file that had no local 
changes. My bad.

> I don't know if it's necessary, but did you reinstall the developer tools and/or the BBEdit CLI tools?
I did reinstall the developer tools and Diff is working with FileMerge. My coworker did _not_ reinstall the developer tools and gets the 
following message:

svn: '/Applications/svnX.app/Contents/Resources/svndiff.sh' returned 127

>Also, if you open the log drawer in the Activity window does it show any info (after clicking Diff)?
No, nothing is shown there.

>Finally, does the Console app display any (relevant) info?
No, nothing there either.
Comment 4 by chr...@lavabit.com, Sep 01, 2009
I'm sure that I read somewhere that svnX required the dev tools to be installed if FileMerge was required,
but I can't find it mentioned in the help.

Apple should really include FileMerge by default - it's tiny.

I'm going to close this issue, but please report any other problems with OSX 10.6.
Status: Invalid
Comment 5 by chr...@lavabit.com, Sep 11, 2009
 Issue 59  has been merged into this issue.
Comment 6 by znarfor, Oct 03, 2009
Same problem there but it re-installing Xcode didn't change anything.

I had to edit svndiff.sh and change /usr/bin/opendiff to /Developer/usr/bin/opendiff
Comment 7 by chr...@lavabit.com, Oct 03, 2009
> Same problem there but it re-installing Xcode didn't change anything.

You don't actually need Xcode.  You really only need /usr/bin/opendiff & FileMerge.app.


> I had to edit svndiff.sh and change /usr/bin/opendiff to /Developer/usr/bin/opendiff

Xcode isn't necessarily installed in /Developer so it would be wrong for me to make that change.
However, if you install 'Compiler & Tools' from 'Command Line Support' in the Xcode installer you should get /usr/bin/opendiff.
[I don't know if this on on or off by default or has been renamed in Xcode 3.2.]
Comment 8 by matthias...@epfl.ch, Oct 13, 2009
Same issue here. After modifying the line as suggested by znarfor, it worked.
Comment 9 by stonebits, Dec 01, 2009
znarfor's fix fixed it -- thanks
Comment 10 by sfgeorge, Dec 10, 2009
Thanks znafor.  That inspired me to do this instead (without having to modify svndiff.sh)

cd /usr/bin
sudo ln -s /Developer/usr/bin/opendiff
Sign in to add a comment

Hosted by Google Code