search

zdl411437734 / svnx

Automatically exported from code.google.com/p/svnx
0 stars 0 forks source link

Diff broken in Mac OS X 10.6 Snow Leopard #57

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago 
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

Original issue reported on code.google.com by mark.app...@gmail.com on 1 Sep 2009 at 5:20

GoogleCodeExporter commented 9 years ago 
Issue also applies to SvnX 1.1b3

Original comment by mark.app...@gmail.com on 1 Sep 2009 at 5:27

GoogleCodeExporter commented 9 years ago 
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?

Original comment by chris...@gmail.com on 1 Sep 2009 at 8:02

GoogleCodeExporter commented 9 years ago 
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.

Original comment by mark.app...@gmail.com on 2 Sep 2009 at 12:12

GoogleCodeExporter commented 9 years ago 
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.

Original comment by chris...@gmail.com on 2 Sep 2009 at 1:08

GoogleCodeExporter commented 9 years ago 
Issue 59 has been merged into this issue.

Original comment by chris...@gmail.com on 11 Sep 2009 at 7:16

GoogleCodeExporter commented 9 years ago 
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

Original comment by znar...@gmail.com on 3 Oct 2009 at 8:52

GoogleCodeExporter commented 9 years ago 
> 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.]

Original comment by chris...@gmail.com on 3 Oct 2009 at 4:37

GoogleCodeExporter commented 9 years ago 
Same issue here. After modifying the line as suggested by znarfor, it worked.

Original comment by matthias...@elzarts.ch on 13 Oct 2009 at 1:25

GoogleCodeExporter commented 9 years ago 
znarfor's fix fixed it -- thanks

Original comment by stoneb...@gmail.com on 2 Dec 2009 at 12:20

GoogleCodeExporter commented 9 years ago 
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

Original comment by sfgeorge on 10 Dec 2009 at 5:56

GoogleCodeExporter commented 9 years ago 
I am using snow leopard O.S in that SvnX when i press diff. i am getting error 
"/application/svnx.app/contents/resources/svndiff.sh: line 72: /usr/bintwdiff:o 
such file or directory
svn:'/applications/svnx.app/contents/resources/svndiff.sh'returned 127"

Original comment by mhm....@gmail.com on 19 May 2011 at 7:11

GoogleCodeExporter commented 9 years ago 
If it’s actually reporting 'line 62: /usr/bin/twdiff: No such file or 
directory' then:
launch TextWrangler & choose TextWrangler > Install Command Line Tools… .

Original comment by chris...@gmail.com on 19 May 2011 at 2:50

GoogleCodeExporter commented 9 years ago 
If you installed Xcode from the AppStore the path for Xcode will no longer be 
in /Developer and opendiff will be broken.

You will need to run the following command:
sudo /usr/bin/xcode-select -switch /Applications/Xcode.app/Contents/Developer/

to point the Xcpde directory to the install path for AppStore.

Original comment by zhongwei...@gmail.com on 19 Mar 2012 at 5:11

GoogleCodeExporter commented 9 years ago 
zhongwei.lu,
I think you’ve got the wrong issue.
See issues #157 & #158.

Original comment by chris...@gmail.com on 19 Mar 2012 at 3:07