Specifying settings for comparing and merging modules

When merging configurations, you can configure the merging of functions and procedures for any module (this includes ordinary application modules, managed application modules, external connection modules, session modules, common modules, object modules, manager modules, and form modules).

To open the module comparison window, right-click a module in the "Compare and merge" window and then click Show Differences in Modules.

The top part of the window contains a table that is similar to the table in the "Compare and merge" window. The only difference is the fact that the column content is taken from the names of the module parts: Variable Declaration Area, procedures and functions section, and Main program area (hereinafter, the objects). Any of these sections can be missing.

The table contents match the current filter (the Filter selection field).

In the first column, for objects that are not identical, mark those that you want merged. You can customize the merge settings for the selected objects. You can set a single merge mode for all procedures by clicking the Set rule for all button, which opens the merge settings dialog box.

The comparison is performed separately for each section, for mapped objects only. Mapping by name is performed automatically as the initial step.

You can clear any mapping of procedures or functions. To clear a mapping, right-click the object row and then click Clear object mapping.

You can edit the result of procedure or function merging in the bottom part of the window.

The following commands are available in the merge result command bar:

  • Find line. Go to the matching line in the comparison field.
  • Next difference. Go to the next difference.
  • Previous difference. Go to the previous difference.
  • Collapse group. Collapse the current group (the cursor can be located anywhere in this group).
  • Expand group. Expand a collapsed group.
  • Collapse all groups. Collapse all groups in a module.
  • Expand all groups. Expand all groups in a module.
  • Format (applies to a selected text fragment). Analyze and format the text by shifting the content of each syntactic construction to the right with the standard tab indent, regardless of the original indents.
  • Increase indent (applies to a selected text fragment). Increase the indent to the left of the selected text.
  • Decrease indent (applies to a selected text fragment). Decrease the indent to the left of the selected text.
  • Add comment. Mark the selected line as a comment.
  • Delete comment. Remove the comment mark from the selected line.
  • Insert line break. Add the line break character "|" to the current line or to the selected text.
  • Delete line break. Delete the line break character from the current line or from the selected text.

If the modules being compared contain procedures or functions that have had their names changed, but these procedures or functions are otherwise unchanged and need to be compared, you have to perform manual mapping of the procedures or functions. To perform manual mapping, right-click any of the objects to be mapped, and then click Set object mapping.

1C:Enterprise Developer's Community