SDiffMergeParameters Class
Description
The class SDiffMergeParameters defines the parameters
for diff or merge.
Syntax
class SDiffMergeParameters
{
String m_strDiffFileArguments;
String m_strDiffDirArguments;
String m_strThreeWayMergeArguments;
String m_strDiffMergeTool;
}
Fields
m_strDiffFileArguments
Specifies the arguments to supply for files comparison when the diff tool is
invoked. The following macros are available (the macros are case-sensitive):
- %FIRST_FILE% - expands to the path of the file that will be
supplied for the left side of the diff output.
- %SECOND_FILE% - expands to the path of the file that will be
supplied for the right side of the diff output.
- %FIRST_LABEL% - expands to the label that will be supplied to the
file being diffed on the left side of the diff output.
- %SECOND_LABEL% - expands to the label that will be supplied to the
file being diffed on the right side of the diff output.
m_strDiffDirArguments
Specifies the arguments to supply for directory comparison when the diff tool
is invoked. The following macros are available (the macros are case-sensitive):
- %FIRST_DIR% - expands to the path of the directory that will be
supplied for the left side of the diff output.
- %SECOND_DIR% - expands to the path of the directory that will be
supplied for the right side of the diff output.
- %FIRST_LABEL% - expands to the label that will be supplied to the
directory being shown differences on the left side of the diff output.
- %SECOND_LABEL% - expands to the label that will be supplied to the
directory being shown differences on the right side of the diff output.
m_strThreeWayMergeArguments
Specifies the arguments for the three-way merge. This parameter allows you to
specify the arguments to supply for three-way merge when the merge tool is
invoked. The following macros are available (the macros are case-sensitive):
- %BASE_FILE% - expands to the path of the file that is the common
ancestor, or baseline between the two files being merged.
- %THEIRS_FILE% - expands to the path of the updated server file that
is being merged.
- %YOURS_FILE% - expands to the path of your local file that is being
merged.
- %RESULT_FILE% - expands to the path of file that will be saved when
the user merges the files together.
- %FIRST_LABEL% - expands to the label supplied by the merge tool to
put on top of the first file being merged.
- %SECOND_LABEL% - expands to the label supplied by the merge tool to
put on top of the second file being merged.
For example, to invoke MergeHero.jar to merge three files, the entry for this
field is as follows:
java -jar %DIFFMERGE_TOOL% -merge %BASE_FILE% %THEIRS_FILE% %YOURS_FILE% %RESULT_FILE%
-LeftLabel %FIRST_LABEL% -Right Label %SECOND_LABEL%
Note: You can adjust the order of "%THEIRS_FILE%"and "%YOURS_FILE%".
m_strDiffMergeTool
Specifies the application for diff/merge.
See Also
