Skip to main content

Command: Commit, Commit project

Symbol: _svn_icon_commit.png

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 menu to commit all changes in the project at the same time

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

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

Dialog: Commit

Table 11. Commit to: <URL of project/object>

URL in the 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 12. Changes made (double-click the object for compare, right-click the 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 colors according to the object status:

  • Blue: Modified

  • Green: Added

  • Dark red: Deleted

  • Red: Conflicted

  • Black: Non-versioned (not in the 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 a lock from going unnoticed in the repository.

Double-click an object 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

standard icon: The object is selected 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 the user who applied the lock is displayed here.

Example: b.mayer

Description

Display of the log message



Select/Deselect All

standard icon: All objects in the list are selected.

Keep Locks

standard icon: Your locked object remains in locked after the commit.

Keep Change Lists

standard icon: 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)

standard icon: The object/project is updated after the commit. Select this check box to make sure 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.

_cds_icon_warning.png Storage profile update

Note that the storage profile (storage version) of the repository in the working copy differs from the one in the SVN repository. In this case, a commit will change the storage profile in the repository.

For actions which require an exchange between the working copy and repository, you will be guided by corresponding messages to match the storage profile. For more information about this, see also: Checking for version profile consistency

OK

Shortcut: Ctrl+Enter

Checks the working copy first

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

. A dialog opens when the working copy is outdated. There you can 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 externals

If the external is in the same SVN repository, then changes in this external are listed in the commit dialog and committed together with the internal project.

If an external is in another SVN repository, then you are notified about changes in the external project and you have to commit these separately.

An external has the externals property.

For more information, see: Version Control the Subversion Way

Context menu (right-click an 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 colors 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.png Clear

Discards your changes to the working copy

After that, 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

There the properties are displayed and you can edit them.

Move to change list

Note: The command has not been implemented yet.