Question

我试图将rhapsody DiffMerge设置为SVN中的合并工具。

在我设置.subversion / config：

[helpers]
    merge-tool-cmd = /opt/rhapsody/i386/7.5.2.1/DiffMerge "$2" "$3" "$1"

在Rhapsody / DiffMerge中设置：

#!/bin/bash                                                                                                                                                                                                                                 
DIFFMERGE_PATH=/opt/rhapsody/i386/7.5.2.1
DIFFMERGE_EXEC=${DIFFMERGE_PATH}/diffmerge.exe                                                                                   
${DIFFMERGE_EXEC} -xmerge "$2" "$3" -base "$1" -mergeReport mergeReport.logs

使用DiffMerge IBM帮助： http://pic.dhe.ibm.com/infocenter/rhaphlp/v7r6/index.jsp?topic=%2Fcom.ibm.rhp.diffmerge.doc%2Ftopics%2Frhp_t_col_specifying_diffmerge_cmdline_syn.html

出现冲突时：

Select: (p) postpone,
        (mf) mine-full, (tf) theirs-full,
        (s) show all options: l
Invalid option.

有人有这个问题吗？

BR Adam

Answer 1

解决，我已将svn版本更改为最新版本（1.8.8）并设定 merge-tool-cmd = DiffMerge

这就是全部。

BR Adam

将rhapsody DiffMerge设置为svn merge-tool

1 个答案: