search

ycaihua / svnx

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

FileMerge stopped working with 10.7.3? #157

Closed GoogleCodeExporter closed 8 years ago

GoogleCodeExporter commented 8 years ago 
What steps will reproduce the problem?
1. Update to OS X 10/7/3
2. Select a file in a working set with FileMerge set as the diff application
3. Click on "diff"

What is the expected output? What do you see instead?
Nothing happens.  FileMerge doesn't launch; no messages show up on the screen 
or in the output window; there are no messages generated for this (that I've 
been able to find, anyway) in /var/log/*

What version of the product are you using? On what operating system?
svnX 1.3.2

Please provide any additional information below.
/usr/bin/opendiff is right where it was, and seems to be unchanged.  FileMerge 
is still in /Developer/Applications/Utilities/FileMerge, unchanged as far as I 
can tell.  FileMerge launches fine; if I launch FileMerge by hand and then try 
to invoke it on a file through the diff icon, nothing happens.

 As far as I can tell, everything worked fine until I ran the 10.7.3 update this morning (which otherwise has caused no problems.  Has anyone else seen this?  Thanks!

Original issue reported on code.google.com by jim.mil...@gmail.com on 7 Feb 2012 at 3:49

GoogleCodeExporter commented 8 years ago 
I don’t have OSX 10.7.3, so I’m going to need you to answer some questions.
I’m going to assume that you are using Subversion 1.6.17 (or similar) & it is 
correctly set (& shown) in svnX’s preferences.

Does the file you selected, in the WC window, contain modifications?
[I.e. does it show an ‘M’ in the first column?  No M => no diffs.]
What do the info & log drawers of the Activity window show for the Diff command?
Does shift clicking Diff work?
[This should diff the selected file(s) against their PREV revisions in the 
repo, even if they have no uncommitted modifications.]

Does running opendiff directly on any 2 text files work?
[Entering ‘/usr/bin/opendiff <text-file-1> <text-file-2>’ in Terminal 
should launch FileMerge & display a window the same way svnX does.]
Try launching svnX from Terminal & performing the Diff to see if any errors are 
logged there.
[Enter ‘<path-to-svnX’s-folder>/svnX.app/Contents/MacOS/svnX’.]

Answering the above questions will help me to help you fix your problem.
I believe that there are already hundreds of people using svnX with OSX 10.7.3.
You are the first to report any problem.

Original comment by chris...@gmail.com on 7 Feb 2012 at 5:21

GoogleCodeExporter commented 8 years ago 
OK, I found the problem -- for some reason, my Xcode folder setting had gotten 
lost -- 

[strat:~] jmiller% /usr/bin/opendiff /Users/jmiller/Desktop/test1.txt 
/Users/jmiller/Desktop/test2.txt
xcode-select: Error: No Xcode folder is set. Run xcode-select -switch 
<xcode_folder_path> to set the path to the Xcode folder.
Error: /usr/bin/xcode-select returned unexpected error.

I've reset the path with xcode-select, and diff/FileMerge is happy again.  
Why/how this setting got lost is beyond me, but there you go.

It would be nice if svnX would catch and report this problem, but, in any case, 
thanks very much for the help!

Original comment by jim.mil...@gmail.com on 7 Feb 2012 at 8:13

GoogleCodeExporter commented 8 years ago 
Same thing happened to me after updating to 10.7.3

Original comment by steveg...@gmail.com on 9 Feb 2012 at 1:30

GoogleCodeExporter commented 8 years ago 
[deleted comment]
GoogleCodeExporter commented 8 years ago 
The next release of svnX will better report errors from opendiff (which are 
currently not shown).
However, that won’t fix the problem — just indicate that there is one.
The real problem appears to be in the [no Mac] OSX 10.7.3 installer — which 
seems to have several problems.
Please complain to NSApple.

Original comment by chris...@gmail.com on 1 Mar 2012 at 2:16

GoogleCodeExporter commented 8 years ago 
This took me a little while to figure out.   I was getting this error only in 
the application but not in the terminal shell.

First find xcode-select, probably at /usr/bin/xcode-select.  Try printing the 
current xcode folder:

bin simon$ xcode-select -print-path
xcode-select: Error: No Xcode folder is set. Run xcode-select -switch 
<xcode_folder_path> to set the path to the Xcode folder

No folder was set, so set it with:

sudo xcode-select -switch /Applications/Xcode.app

or wherever your Xcode is installed.  For me, Xcode 4.3.2 automatically 
installed to /Applications but version 3.2.6 installed itself under /Developer.

Original comment by simonhu...@gmail.com on 7 May 2012 at 8:03

GoogleCodeExporter commented 8 years ago 
Which version of svnX are you using?
This shouldn’t be an issue with svnX 1.3.3.

Original comment by chris...@gmail.com on 8 May 2012 at 1:46

GoogleCodeExporter commented 8 years ago 
Good find.. works.

Original comment by chad.ko...@gmail.com on 11 Jun 2012 at 3:57