This option allows you to specify the default option when doing a diff of a working file against other items.
Select one of the following options.
Diff against last version retrieved from the repository. This is the baseline version, and will show you what changes you made to the file.
Diff against current version in repository. This option will show you what changes you will introduce to the repository version if you check the file in. This is different from the baseline version if someone has checked in another version since you began editing.
The default is Diff against last version retrieved from the repository.
This option allows you to specify an external application to be launched by the Diff command.
Either type the full path to the External Diff program, or use the Browse button to
find the diff tool, if necessary. The macro %VAULT_EXE_DIR% can be used to
specify the location where the Fortress client is currently
running, and will expand to the actual folder of the executable folder.
The default entry for this field contains the default that is appropriate for
SourceGear’s DiffMerge tool: %VAULT_EXE_DIR%/sgdm.exe
This option allows you to specify the arguments to supply to the diff tool when it is invoked, such as the files to use for the diff, and labels to use for them, if the diff tool accepts such arguments. The following macros are available:
%LEFT_LABEL% - expands to be the label Fortress
will supply to the file being diffed on the left side of the diff output.
%LEFT_PATH% - expands to the path of the file that
Fortress will supply for the left side of the diff
output.
%RIGHT_LABEL% - expands to be the label Fortress
will supply to the file being diffed on the right side of the diff output.
%RIGHT_PATH% - expands to the path of the file that
Fortress will supply for the right side of the diff
output.
The default entry for this field contains the default that is appropriate for SourceGear’s DiffMerge tool:
/ro1 /ro2 /title1:"%LEFT_LABEL%" /title2:"%RIGHT_LABEL%" "%LEFT_PATH%"
"%RIGHT_PATH%"
This option allows you to specify an external application to be launched by the Merge command.
Either type the full path to the External Merge program, or use the Browse button to find the merge tool, if necessary. The macro
%VAULT_EXE_DIR% can be used to specify the location where the
Fortress client is currently running, and will expand to the
actual folder of the executable folder.
The default entry for this field contains the default that is appropriate for
SourceGear’s DiffMerge tool: %VAULT_EXE_DIR%/sgdm.exe
This option allows you to specify the arguments to supply to the merge tool when it is invoked, such as the files to use for the merge, and labels to use for them, if the merge tool accepts such arguments. The following macros are available:
%WORKING_PATH% – expands to the user’s working file that is being
merged.
%WORKING_LABEL% – expands to the label supplied by
Fortress to put on top of the working file.
%DEST_PATH% – expands to the file that will be saved when the user merges
the files together. In Fortress, this is actually the same as
the working file, but merge tools usually have a separate argument for this, so
Fortress will just supply the working file as this
file.
%DEST_LABEL% – expands to the label supplied by
Fortress to put on top of the merged file.
%OTHER_PATH% – expands to the path of the “other” file being merged. For
most cases, this is the current repository version that is being merged, but in the
case of merge branches, it is the origin version of the file that needs merged with
the target version.
%OTHER_LABEL% – expands to the label supplied by
Fortress to put on top of the “other” file being merged.
%BASELINE_PATH% – expands to the path of the file that is the common
ancestor, or baseline between the 2 files being merged.
The default entry for this field contains the default that is appropriate for SourceGear’s DiffMerge tool:
/ro1 /ro3 /merge /title1:"%WORKING_LABEL%" /title2:"%DEST_LABEL%"
/title3:"%OTHER_LABEL%" /result:"%DEST_PATH%" "%WORKING_PATH%" "%BASELINE_PATH%"
"%OTHER_PATH%"