Command 'Commit', Command 'Commit Project'Permalink

Symbol: _svn_icon_commit

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

Call:

  • Context menu: “SVN” to commit exactly this object

  • “Project  SVN  Commit Project” to commit all changes in the project at the same time

Requirement: At least one object was modified. An object whose contents have been modified is overlaid in the object tree with the _svn_icon_status_modified, _svn_icon_status_modified_properties, or _svn_icon_status_modified_binary_only symbol.

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

Dialog 'Commit'

Table 946: “Commit to: <URL project/object>”

URL in SVN repository

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

“Log message”

Type in a log message that comments your change.

Example: ‎Bug fix error 123‎

“Recent Messages”

Opens the “Recent Messages” dialog for displaying the last log messages. You can click a log message to accept it.

Table 947: “Changes made (double-click on object for compare, right-click on object for more operations)”

_svn_img_commit_objects

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 “Show non-versioned objects” option is selected.

  • Gray: Excluded from commit

    Note: This is the case when the “Ignore during commit” option is selected.

The list also contains objects which have not been modified but have a lock. This helps to prevent locking from going unnoticed in the repository.

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: When the “Commit Project” command has been executed, a list of objects is shown here. When the “Commit” command is applied to a specific object, only this object is shown (if modified or locked) and its modified or locked child objects.

“Object”

_cds_icon_option_activated: The object is selected for the commit.

Example: _svn_img_list_of_modified_objects

“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: All objects in the list are selected.

“Keep Locks”

_cds_icon_option_activated: Your locked object remains in locked after the commit.

“Keep Change Lists”:

_cds_icon_option_activated: The change list also remains after the commit.

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

“Update After Commit (recommended)”

_cds_icon_option_activated: 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.

Button “Update Project”

Updates the project

Hint: 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 from the following:

  • “Abort the commit, I want to investigate 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)

Handling external objects

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.

Context menu (right-click on object)

_svn_icon_compare “Compare”

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

_svn_icon_compare “Compare with HEAD version”

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

_svn_icon_compare“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 repository)

    Note: These objects are displayed when the “Show non-versioned objects” option is selected.

  • Gray: Excluded from commit

    Note: This is the case when the “Ignore during commit” option is selected for the object.

_svn_icon_revert“Clear”

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

_svn_icon_log“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.