Yummy Software

Yummy FTP => Problems & Bugs => Topic started by: pusle on August 24, 2011, 03:08:21 PM

Title: Diff with Filemerge on Lion won't work
Post by: pusle on August 24, 2011, 03:08:21 PM: Hi,

I have Yummy installed on my work and home computer. On both I have installed both filemerge and Textwrangler, and on both, diff works with Textwrangler (when uploading or downloading, it asks wether to overwrite, resume .. And diff).

On my home computer where I run Lion, diff with filemerge don't work, but on my work computer it does. There are no error messages when trying to diff with filemerge on the Lion mac, nothing just happens.

Hope someone can help.

Hope I have made myself understood. Thanks!
Title: Re: Diff with Filemerge on Lion won't work
Post by: JD on August 24, 2011, 03:16:58 PM: I guess Apple changed something in Lion that broke the compatibility.

I'll check this out and if possible I'll add a fix for the next update - v1.8.6, coming soon :)

In the mean time, use TextWrangler. It works well, better than FileMerge in my opinion.
Title: Re: Diff with Filemerge on Lion won't work
Post by: JD on August 24, 2011, 03:59:43 PM: I don't see any problem with FileMerge. It's working without issue.

What happens if you use opendiff from the Terminal?
Title: Re: Diff with Filemerge on Lion won't work
Post by: JD on September 19, 2011, 05:46:44 AM: Ah.. found the issue. In Lion they moved the opendiff executable (which Yummy invokes to call FileMerge) into the Developer -> usr -> bin folder, so now when calling opendiff directly in Terminal the command is not found. I needed to change Yummy so that if Lion is running then specifically call out to the Developer folder. Works now... fix will be in the 1.8.6 b3 update.

I guess mine was still working because I did an upgrade, so the original opendiff was still there.
Title: Re: Diff with Filemerge on Lion won't work
Post by: pamelus on March 28, 2012, 03:40:20 PM: Hi,

This issue returns on OS X Lion 10.7.3 with newly installed Xcode 4.3.2 - opendiff executable is now again in /usr/bin/opendiff
FileMerge.app is in /Applications/Xcode.app/Contents/Developer/FileMerge.app

To make FileMerge work on my machine I had to create /Developer directory with a symlink usr to /usr inside. Without that nothing happens after clicking "diff". Any chances to fix this in further releases?

Also Xcode 4.3.2 requires to call sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer otherwise opendiff will throw "Error: No Xcode folder is set.". Gah… It's not easy to bring FileMerge working now.
Title: Re: Diff with Filemerge on Lion won't work
Post by: JD on March 28, 2012, 04:17:17 PM: Yes, this is fixed in v1.8.9 which is being released imminently :)
Title: Re: Diff with Filemerge on Lion won't work
Post by: pamelus on March 31, 2012, 01:50:32 PM: Great, looking forward for hearings about new version. ;)