Skip to main content

Command: Merge Changes

Symbol: svn_icon_merge_changes.png

Function: The command opens the Merge dialog. In this dialog, you determine the revisions with the changes to be merged with the working copy of the project.

Call: Project → SVN menu

Requirement: The project is linked to SVN.

Dialog: Merge

Kind of merge

  • Sync/Reintegrate/Symmetric merge: All missing changes from the trunk (or a different branch) are synchronized with this branch.

  • Cherry pick: Integrates specifically selected revisions from one branch to another branch. This is necessary, for example, if any error trapping has to be ported back to an older version.

Merge source

SVN URL of the SVN repository

Define start and end revision

Select this option to merge a related range of revisions with the working copy.

Start revision

Defines the range of revisions that are merged with the working copy

  • HEAD: HEAD revision

  • Revision: Start and end revision of the range

  • Date: Date of the start and end revisions

End revision

Define revision range

Select this option when you want to merge individual revisions with the working copy. You can also highlight the individual revisions in the Log dialog.

Note: When defining ranges, CODESYS SVN behaves like other graphical clients, such as Tortoise SVN), and not like the command-line client. Example: For a range of 4–7, revisions 4, 5, 6, and 7 are merged.

For more information, see: Merging a Range of Revisions

Dry run (simulation)

standard icon: The command is executed without making changes to the working copy. Files that are changed during an actual merge are displayed, as well as ranges where conflicts occur.

Record only

standard icon: The revision is marked as "merged" without actually performing the merge.

Ignore ancestry

standard icon: SVN uses path-based differences only, not history-based differences.

: