Merge

Behavior for the commands Update, Merge, or Switch, when both sides (working copy and SVN repository) have changed from the base version.

• Mark all colliding changes as conflicts: The objects are not merged automatically. All changes with a conflict are marked as "With conflict", even if some of them can be merged automatically.

• Merge mergeable changes, mark the others as conflicts: Changes that can be merged are merged automatically. All others are marked as "With conflict".

• Merge mergeable changes, ask the user for the others: Changes that can be merged are merged automatically. The user is prompted for all others.

• Always ask the user, even for mergeable changes: For all changed objects, the user is prompted, even if some of them can be merged automatically.

Locks

Behavior such as CODESYS SVN objects when they are changed locally.

• Always try to lock before modification: All objects are locked before they are changed, even if they can be merged.

• Only lock the objects which don't support merging: Only those objects are locked that cannot be merged automatically.

• Never acquire a lock automatically: No objects are locked, not even if they can be merged automatically.

Marker

• Use conflict markers when merging objects: If objects with conflicts exist that cannot be merged, then these conflicts are marked in the source code with conflict markers. In addition, the object itself is marked as being merged successfully (no conflict).

• Leave non-mergeable objects as conflicted: No conflict marker is set. Objects that cannot be merged remain in the status "With conflict".

Prompt the user when automatic locking fails.

: If it is not possible, to lock the object, then the dialog Automatic locking failed opens (see dialog description).

Check server for updates and locks

: CODESYS SVN checks in the specified time interval that objects have been updated on the server. In addition, it checks whether objects are locked or locks have been stolen.

Check interval (minutes)

Example: 10

Ignore whitespace

: Whitespace differences between the current project and the reference project are ignored.

Ignore comments

: Comments in the programming code are excluded from the comparison.

Ignore Properties

: Object properties are excluded from the comparison.

libssh2 (recommended)

CODESYS SVN uses Libssh2 for establishing a connection via SSH protocol. This is the recommended setting.

SharpPlink (backwards compatibility)

CODESYS SVN uses plink.exe for establishing a connection with SSH servers. This option is required only for communication with outdated servers that support the deprecated SSH-1 protocol.