Skip to Content

37.2.6. Comparison/merging

<< Prev   Next >>

This tab is used to set up the parameters of add-in, that can be used to compare/merge modules.

Fig. 772. Setting-up add-ins for comparison/merging

The programs that can be used for comparison/merging of files are listed in the Add-ins list.

The parameters for the following Designer add-ins are set by default:

  • Araxis Merge
    • Operating system in use: Windows
    • Website: http://www.araxis.com/merge/
    • Executable file: compare.exe
    • Supported modes:
      • Comparison of two files
      • Merging two files
      • Trilateral merging
  • KDiff3:
    • Operating system in use: Windows and Linux
    • Website: http://kdiff3.sourceforge.net/
    • Executable file: kdiff3.exe for Windows and kdiff3 for Linux
    • Supported modes:
      • Comparison of two files
      • Merging two files
      • Trilateral merging
      • Automatic trilateral merging
  • TortoiseMerge:
  • Perforce P4Merge:
  • DiffMerge:

However, to use add-ins, an additional setup is required, you need to specify the path to the executable file.

Modules group is used to specify which mechanism will be used for executing a specific operation:

  • Show differences without structure. It is used to select the mechanism that will be used when using a corresponding command in the configuration comparison/merging window. Selecting the Ordinary method item means that the Designer's built-in mechanism will be used for comparison of two files contents. Also, add-ins with specified Path and Compare two files properties will be available for selection.
  • Merging settings when merging two configurations. It is used to select a mechanism that will be used for merging two configurations. Selecting the Ordinary method item means that the Designer built-in mechanism will be used for merging two files contents. Also, add-ins with specified Path and Merge two files properties, will be available for selection.

Supported configuration update group describes 1C:Enterprise behavior, when updating a supported configuration.

  • "Take from", "Merge with priority" modes. Defines what will be used for interactive merging. Selecting the Ordinary method item means that the Designer built-in mechanism will be used for merging (two-way). Also, add-ins with filled-in Path and Trilateral merging properties, will be available for selection.
  • Merge using add-in mode. It is used to specify which add-in will be used for trilateral merging and allows to manage the availability of the Merge using add-in mode in the in the configuration update settings. Add-ins with Path and Trilateral merging properties filled are available for selection.

    If this property is set to Not used, then the Merge using add-in feature disappears from the merging mode settings. When saving Designer settings all merging modes, where the use add-in property is set, are replaced with Take from new vendor configuration mode (if the update main configuration window is open).

    If an add-in is specified in this property, and the use by default check box is selected, when saving settings the Merge using add-in merging mode is selected.

It is possible to add a native file content comparison utility. To do so, click Add and specify all the parameters in the opened dialog box.

Fig. 773. Add-ins settings

The Name field is used to specify the presentation of the comparison program.

The path to the utility is specified in Executable file field. If the path to an executable file is not specified, this add-in is displayed in gray color in the Add-ins list and these programs cannot be selected in other comparison and merging settings. In fig. 772, DiifMerge, TortoiseMerge, and Perforce P4Merge are displayed in gray color. For the Araxis Merge and KDiff3 programs, a path to the executable file is specified.

In the following fields (Command line group), the command line parameters are defined for the add-in that is used for any operation from Designer:

  • Comparison of two files. Two files contents are interactively compared.
  • Merge two files. Two files contents are interactively merged (with a feature that allows modification of the acquired result).
  • Trilateral merging. Three files contents are interactively merged (with a feature that allows modification of the acquired result).
  • Automatic trilateral merging. Automatic merging of three files contents. Is not performed interactively if there are no conflicts when merging.

The command line parameters that will be passed to the add-in for executing operations are set for each field with an identical name. If an operation is not supported by the utility, the corresponding field is left blank.

When forming the command line you can use the following predefined parameters:

  • %basecfg. Path to file from the main configuration.
  • %secondcfg. Path to file from the second configuration. The second configuration can be:
    • Configuration from file
    • Vendor configuration (new vendor configuration if updated)
    • Configuration from configuration repository
    • Database configuration
  • %oldVendorCfg. Path to file from the previous vendor configuration.
  • %merged. Path to the resulting file (merging result).
  • %baseCfgTitle. Window title for the file from the main configuration.
  • %secondCfgTitle. Window title for the file from the second configuration.
  • %oldVendorCfgTitle. Window title for the file from the previous vendor configuration.

<< Prev   Next >>

Icon/Social/001 Icon/Social/006 Icon/Social/005 Icon/Social/004 Icon/Social/002