Command 'Edit SVN working copy'

Symbol:

Function: This command opens the dialog Edit SVN working copy and displays the working copy in a browser from the SVN view.

Call: Menu bar: Project ‣ SVN .

The functionality of the browser allows for:

  • Access to and actions on objects that are not displayed in the Devices view.

  • Actions on objects that can lead to exceptions in the Devices view.

  • Editing of global objects that are modified, in conflict, or blocked.

Dialog ‘Edit SVN working copy'

Edit SVN working copy: <project name> - <project URL>

Path in SVN repository

Display of working copy from SVN view. The file and folder structure of the objects in the project are presented in a tree view. In this way, the recursion depth of an object is clear.

: Object selected for the following menu command

Name of object

File name of the object

Example: Application

Node type

The top node is the project root directory.

Text status

Object status:

  • modified

  • added

  • deleted

  • non-versioned

  • Conflicted

Property status

Status in SVN repository:

  • modified

  • added

  • deleted

  • Conflicted

  • normal

Revision

Revision number

Conflict information

File conflict, property conflict, or tree conflict

Lock

For locked objects, the user who applied the lock is displayed.

Example: b.mayer

Lock comment

Lock message. Implicit, normal, or stolen lock.

URL

URL of the object

Menu commands

Select ‣ All

Selects all files.

Select ‣ None

Deselects all files.

Select ‣ Modified

Selects the modified files.

Select ‣ Conflicted

Selects the conflicted files.

Select ‣ Locked

Selects the locked files.

Updates the working copy. Changes made by others are added from the SVN repository to your working copy.

Update ‣ Project

Updates all files of the project.

Update ‣ Selected nodes

Updates only the selected files.

Update ‣ Selected nodes and children

Updates the selected files and subordinate files.

Reset

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

Delete ‣ Selected nodes

Deletes the selected objects from the working copy.

Commit

Commits your changes to the SVN repository. Any locked objects will be unlocked.

Commit ‣ Project

Commits all files in the project.

Commit ‣ Selected nodes

Commits only the selected files.

Commit ‣ Selected nodes and children

Commits the selected files and subordinate files.

Commands for managing locks.

Locks ‣ Revalidate all

Checks the validity of locks in the working copy. Any invalid locks will be unlocked.

Locks ‣ Release locks

Releases the lock.

Locks ‣ Acquire locks

Locks the object from editing by others.

Locks ‣ Steal locks

Locks the file for you and removes the lock of another user.

Tip: Avoid stealing a lock because the changes made by another user can be lost.

Commands to resolve conflicts.

Conflicts ‣ Mark as resolved

Indicates a displayed conflict in the SVN repository as marked and resolved.

Note: Select the command if you edited and resolved the displayed conflict. Then you can commit changes again.

Conflicts ‣ Resolve using theirs

Resolves the conflict: In the SVN repository, the changes are accepted that were committed by other users. Your changes are discarded.

Conflicts ‣ Resolve using mine

Resolves the conflict: In the SVN repository, the changes to your working copy are accepted and the changes by other users are discarded.

Show log

Opens the dialog Log - Application. The history of the selected node is shown here. The previous revisions are displayed with the respective actions.

Change location

Changes the storage location of the selected object within the working copy.

Example: You can resolve a tree conflict by saving the local object to another location. Then update the parent object to apply it to the locked children.

Update

Updates the browser view by rescanning the working copy.

Cleanup

Executes an SVN cleanup operation on the working copy.

See also