Issue #184 resolved

P2D3::filemerge is not detected

Toby Evans
created an issue

It seems usr/bin/opendiff is not detected if it was installed with the ios sdk instead of the os dvd.

  • I'm making an assumption that this is the case.

Comments (17)

  1. Jason Harris repo owner

    You are getting the warning:

    /usr/bin/opendiff was not found on this system.
    Please install the developer tools from the system
    disk which came with your computer (they contain the
    application FileMerge). MacHg can function without
    FileMerge but you cannot view any diffs, since this
    is the tool MacHg uses to view diffs.
    

    In a error alert when you run MacHg, Correct?

    The developer tools need to be installed to use opendiff. Can you install the developer tools again and see if this fixes the problem?

    Also see #98

    Thanks, Jason

  2. soycamo

    Incidentally, I have the Developer Tools (xcode 3.2.6) installed but I also get the message that FileMerge cannot be found, even though it is located at /Developer/Applications/Utilities/

    I'm happy to fix this once I find where it's being referenced in the code.

  3. Anonymous

    For me it helped to open FileMerge directly one time, after that Mac Hg didn't show any error.

  4. Lee Dohm

    REPRO STEPS

    1. Delete /Developer and /Developer-old
    2. Install developer tools
    3. Launch MacHg

    EXPECTED

    MacHg finds FileMerge and shows no error.

    ACTUAL

    MacHg displays error: "FileMerge was not found on this system ..."

  5. Jason Harris repo owner

    Sorry for being late about this, but I had to install on a new machine and I can reproduce this! I will fix it shortly!

    It turns out that /usr/bin/opendiff is no longer installed in /usr/bin for some reason under at least Lion, but maybe later versions of Snow Leopard as well...

    Cheers, Jas

  6. Jason Harris repo owner

    - Fix issue #184. - Look to /Developer/usr/bin/opendiff if /usr/bin/opendiff doesn't exist as it doesn't on newer installs of the developer tools (No thanks to Apple for that handy change!) - Ensure that we launch FileMerge at least once if it the workspace manager doesn't think FIleMerge exists since it hasn't been launched before.

    Wiki macro error: Changeset 3b4f6ab6737d not found.

  7. Jason Harris repo owner

    - Fix issue #184. (MacHg searches harder for the location of FileMerge) - Look to /Developer/usr/bin/opendiff if /usr/bin/opendiff doesn't exist as it doesn't on newer installs of the developer tools (No thanks to Apple for that handy change!) - Ensure that we launch FileMerge at least once if it the workspace manager doesn't think FIleMerge exists since it hasn't been launched before.

    378b77f648e5

  8. Nigel King

    I have just upgraded to Lion (10.7.2 from 10.6.8) and the FileMerge has stopped working from the Diff button. /usr/bin/opendiff doesn't exist, /Developer/usr/bin/opendiff does exist from the terminal. Kdiff works. Before upgrading FileMerge was not perfectly reliable. If FileMerge was not open then it needed two presses of the Diff button. This may be a slightly different problem. Ideas?

    Thanks Nigel

  9. Jason Harris repo owner

    You could do a build from sources... Or wait a day or so for me to do a new release. I haven't done a release since I was traveling for the last two weeks and preparing like mad before then. I should maybe be able to do a release later today or tomorrow...

    Or you could simply make a symlink from /usr/bin/opendiff -> /Developer/usr/bin/opendiff

    eg open terminal and execute

    cd /usr/bin
    sudo ln -s /Developer/usr/bin/opendiff
    

    Cheers, Jas

  10. Anonymous

    If you update Xcode to version 4.3.2 +, you have to do two more things to get the file merge to work again

    1. download the developer tools from inside Xcode ( Preferences -> Downloads -> Components -> Command Line Tools )
    2. fix the opendiff path with $sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer/
  11. Ironlung

    Awesome thanks...

    Quote "If you update Xcode to version 4.3.2 +, you have to do two more things to get the file merge to work again download the developer tools from inside Xcode ( Preferences -> Downloads -> Components -> Command Line Tools ) fix the opendiff path with $sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer/ "

  12. Log in to comment