Command 'Update', Command 'Update project'

Symbol:

Function: This command commits changes in the SVN repository to the project. The update is performed with the HEAD revision.

Call:

Menu bar: Project ‣ SVN .

Context menu ‣ SVN

If nothing or the main node is selected, then the entire project is updated (Update project). If one or more objects are selected, then these objects and their sub-objects are updated (Update SVN).

The following cases are possible:

Projects are added to the project that are present in the SVN repository, but not in the project. In this case, the message "Added <object>" is issued to the message view.

Objects that no longer exist in the SVN repository, but are present in the project locally (and not marked as "added”), are treated according to the Subversion standard procedure: If local changes are present, then the object remains in the project as unversioned. If there are no local changes, then the object is also deleted locally because the user can retrieve the object from an older version at any time. In this case, "Deleted object" is issued to the message view.

Versioned objects that exist in both the SVN repository and the project are updated if they are different. Three cases to observe:
- No local changes have been made since the last update: In this case, the local object is overwritten by the contents from the SVN repository. The message Object updated is issued to the message view.
- Local changes have been made since the last update and the corresponding object type can be merged. When versions have been merged successfully, the message Objects merged is issued to the message view. If the command is not executed successfully, then the object is marked as "Conflicted object" in the object tree and the message Conflicted object is issued.
- Local changes have been made since the last update and the corresponding object type cannot be merged. In this case, the object is marked as "Conflicted object" in the object tree and the message Conflicted object is issued.

If only some of the objects are updated, it may be that objects with the same name already exist. For example, this situation can come from moving objects to a folder.

For this conflict, you can react in the following ways:

Do nothing and leave the conflict-causing objects as they are.

Update (and remove) the conflicting objects in order to correct the conflict.

Update the entire project in order to remove all conflicting objects and correct the conflict.