diffmerge tool on svnX 2.0 OSX 10.12

66 views
Skip to first unread message

anh.t...@gmail.com

unread,
Nov 29, 2017, 7:12:27 AM11/29/17
to svnX
Hello,

I try to set diffmerge ad a diff tool and svnX popups with "Can’t find tool ‘diffmerge.sh’ required to use DiffMerge."
svn and diffmerge.sh are in local directory which is exported through .profile (seems ok, since i can execute that diffmerge.sh to open Diffmerge from command line)

diffmerge.sh content:
---------------------------------------------------------------------------------------------------------------------------------------

#!/bin/sh

## A little script to make it easier to launch DiffMerge from the command line.

## Install this script into a folder in your path, such as /usr/bin or /usr/local/bin.

##

## Version 4.2.1.1013

## Copyright (C) 2003-2015 SourceGear LLC. All Rights Reserved.

##############################################################################


## Change DIFFMERGE_PATH to point to where you installed DiffMerge


DIFFMERGE_PATH=/Users/antrinh/Applications/DiffMerge.app


## The actual executable is hidden inside the .app bundle.


DIFFMERGE_EXE=${DIFFMERGE_PATH}/Contents/MacOS/DiffMerge


## Launch DiffMerge using the given command line arguments.  Use --help for

## additional information or see the man page distributed along with this

## shell script.


exec ${DIFFMERGE_EXE} --nosplash "$@"

---------------------------------------------------------------------------------------------------------------------------------------


using OSX 10.12.6



Any pointers would be great.


Thanks


chris

unread,
Nov 29, 2017, 7:32:43 AM11/29/17
to svnX
Hello Anh,


On Wednesday, 29 November 2017 12:12:27 UTC, Anh Trinh wrote:
I try to set diffmerge ad a diff tool and svnX popups with "Can’t find tool ‘diffmerge.sh’ required to use DiffMerge."
svn and diffmerge.sh are in local directory which is exported through .profile (seems ok, since i can execute that diffmerge.sh to open Diffmerge from command line)

Your other message mentions “~/local/bin”.  SvnX does not search that directory.
SvnX looks in the following directories for the diff tool:
/Applications/Xcode.app/Content/Developer/usr/bin
~/bin
/usr/bin
/bin
/usr/local/bin
/Developer/usr/bin
These paths are defined in ‘svnX.app/Contents/Resources/DiffApps.plist’.
I don’t believe that ~/local/bin is a standard directory.
[However, I am willing to consider additions/changes to the list.]
I don’t believe that GUI applications normally use .profile.
I would suggest placing diffmerge.sh in ~/bin.

Hope that helps.

Regards,

CHRIS


nasaa...@gmail.com

unread,
Nov 29, 2017, 5:52:21 PM11/29/17
to svnX
sweet!!!, moved to ~/bin and works.
it would be great if you have a  text box to add additional path, or let's user know in the error popup that it looks for certain directory.  
Maybe it was there but i didn't pay attention.

thanks Chris
Reply all
Reply to author
Forward
0 new messages