Command 'Commit', Command 'Commit project'

Symbol:_svn_icon_commit.png

Function: This command commits changes that were made in CODESYS to the SVN repository. The Commit dialog opens for this purpose.

Call:

Requirement: At least one object was edited. The edited object is over­laid in the object tree with the _svn_icon_status_modified.png icon.

When you execute the command, the block on the objects to be committed is lifted automatically.

Dialog 'Commit'

Commit to: <URL project/object>

URL in SVN repository

Example: file:///D:/SVN repository/trunk/ControlABC.project

Log message

Comment the change in a log message.

Example: Bug fix error 123

Recent Messages

Opens the dialog Recent Messages to display the last log messages. You can click a log message to accept it.

Changes made (double-click on object for compare, right-click on object for more operations)

_svn_img_commit_objects.png 

List of objects that were changed and can therefore be committed. The SVN URLs mirror the hierarchy of the object in the SVN repository.

The objects are highlighted in color according to the object status:

  • Blue: Modified

  • Green: Added

  • Dark red: Deleted

  • Red: Conflicted

  • Black: Non-versioned (not in SVN repository)

    Note: These objects are displayed when the option Show non-versioned objects is activated.

  • Gray: Excluded from commit

    Note: This is the case when the option Ignore during commit is acti­vated.

Double-click an object in order to open the compare dialog. The revision of the working copy is compared with the base revision. The compare dialog also opens when you click Compare in the context menu.

Right-click an object in order to open the context menu.

Note: This opens a list of objects when Commit project was clicked. For the Commit command applied to a specific object, only this object is listed (if modified) and its modified children.

Object

_cds_icon_option_activated.png: The object is activated for the commit.

Example: _svn_img_list_of_modified_objects.png

Text status

Object status in CODESYS

  • Modified

  • Added

  • Deleted

  • Non-versioned

  • Conflicted

Property status

Status of the metadata of the object

  • Modified

  • Added

  • Deleted

  • Conflicted

  • Normal

Lock

If the object has a lock, then it is shown here the user who applied the lock.

Example: b.mayer

Description

Display of the log message

Select/deselect all

_cds_icon_option_activated.png: All objects in the list are activated.

Keep locks

_cds_icon_option_activated.png: Your locked object keeps remains in lock status after the commit.

Keep change lists:

_cds_icon_option_activated.png: The change list also remains after the commit.

_cds_icon_option_deactivated.png: The change list is not deleted after the commit.

Update after commit (recommended)

_cds_icon_option_activated.png: The object/project is updated after the commit. Select this check box to ensure that the project is up-to-date and to prevent conflicts resulting from mixed revisions of working copies.

See also: SVN help

Button Update project

Updates the project.

Tip: Prevent conflicts by committing a previously updated project/object.

OK

Keyboard shortcut Ctrl+Enter

Keyboard shortcut Ctrl+Enter

Checks the working copy first. Starts the commit of changes when the working copy is current.

Opens a dialog when the working copy is outdated. You can then select the following:

  • Abort the commit, I want to investi­gate the issue.

  • Yes, I want to update this project now.

  • Continue with the commit, I know what I do.

Note: The history of the commit is displayed in the Messages view.

The messages are highlighted in color.

  • Blue: Commit a change

  • Green: Add an object

  • Dark red: Delete/replace an object

  • Black: Other messages (summary)

Note

Handling external objects If the external object is in the same SVN repository, then changes in this external object are listed in the commit dialog and committed together with the internal project. If an external object is in another SVN repository, then you are notified about changes in the external project and you have to commit these separately.

An external object has the externals property.

See also

Context menu (right-click on object)

_svn_icon_compare.png Compare

Opens the compare dialog to compare the working copy with the top-level revision.

_svn_icon_compare.png Compare with HEAD version

Opens the compare dialog to compare the working copy with the HEAD revision.

_svn_icon_compare.png Compare with revision

The list entries are highlighted in color according to the object status:

  • Blue: Modified

  • Green: Added

  • Dark red: Deleted

  • Red: Conflicted

  • Black: Non-versioned (not in SVN reposi­tory)

    Note: These objects are displayed when the option Show non-versioned objects is activated.

  • Gray: Excluded from commit

    Note: This is the case when the option Ignore during commit is activated for the object.

_svn_icon_revert.png Revert

Discards your changes to the working copy. Then the object corresponds to the revision in the SVN repository.

_svn_icon_log.png Show log

Shows the version history of the selected object.

Properties

Opens the SVN Properties dialog. The properties are displayed there and you can edit them.

Move to change list

Note: This command has not been implemented yet.

4.2.2.0

© Copyright 2019, CODESYS GmbH