svn - 尝试从 svn 启动 diffmerge 时获取退出代码 255

Question

我正在按照提供的步骤在雪豹上尝试将 DiffMerge 与 svn(版本 1.6.16)集成 here .我做了以下更改:

1)创建一个脚本，看起来像:

#!/bin/bash
DIFFMERGE_PATH=/Applications/DiffMerge/DiffMerge.app
DIFFMERGE_EXEC=${DIFFMERGE_PATH}/Contents/MacOS/DiffMerge
${DIFFMERGE_EXEC} --nosplash -m -t1="Incoming"  -t2="Original" -t3="Current" -r="$4" "$2" "$1" "$3"

2) Ran chmod +x ~/Scripts/diffmerge-svnmerge.sh

3) Added the following command to ~/.subversion/config file:

merge-tool-cmd = <HOME>/Scripts/diffmerge-svnmerge.sh

4) 出于测试目的，我确保在尝试更新文件时发生冲突，并使用 'l' 选项启动 DiffMerge 来解决冲突。我每次都会收到以下错误消息: The external merge tool exited with exit code 255
任何想法我做错了什么？

谢谢!

Answer 1

这对我有用(Subversion 1.7.5)

#!/bin/bash
DIFFMERGE_PATH=/Applications/DiffMerge.app
DIFFMERGE_EXEC=${DIFFMERGE_PATH}/Contents/MacOS/DiffMerge
DIFFMERGE_ARGS=()
COLCOUNT=1
for I in "$@"; do
    case "${I}" in
        "-E")
            ;;
        "-L")
            DIFFMERGE_ARGS[${#DIFFMERGE_ARGS[*]}]="-t${COLCOUNT}"
            COLCOUNT=$((${COLCOUNT}+1))
            ;;
        *)
            DIFFMERGE_ARGS[${#DIFFMERGE_ARGS[*]}]="${I}"
            ;;
    esac
    echo "Arg: ${I}" >> /Users/kosh/tmp/diffmerge.cmd
done
${DIFFMERGE_EXEC} --nosplash "${DIFFMERGE_ARGS[@]}"
exit ${?}