0
点赞
收藏
分享

微信扫一扫

SVN Workspace Synchronization


SVN Workspace Synchronization is shown in the 'Synchronize View' after a click on a 'Team>Synchronize' menu item or 'Synchronize' button on 'Team' toolbar of the 'Team Synchronizing' perspective. It provides a probability to inspect the changes types of your local copy from the remote one.

This is how 'SVN Workspace Synchronization' in the 'Synchronize View' looks like:

SVN Workspace Synchronization_ide

Synchronization state

The synchronization state is shown with the help of the following icon decorations:

Icon

Description


SVN Workspace Synchronization_ico_02

An incoming addition icon means, that the marked resource was added to a repository location, so it's new comparatively to the local copy. It will be added to the local copy after update action.


SVN Workspace Synchronization_sed_03

An incoming change icon means, that some changes to the marked file were made comparatively to your local copy. The changes will be added to the local copy after update action.


SVN Workspace Synchronization_SVN_04

An incoming deletion icon means, that this resource was deleted from a repository location, but it's still contained in the local copy. It will be deleted from the local copy after update.


SVN Workspace Synchronization_sed_05

An outgoing addition icon means, that the marked resource was added to the local copy, so it's new comparatively to the repository location. It will be added to the repository after commit action.


SVN Workspace Synchronization_sed_06

An outgoing change icon means, that some changes to the marked file were made comparatively to the repository location. The changes will be added to the repository after commit action.


SVN Workspace Synchronization_UP_07

An outgoing deletion icon means, that the marked resource was deleted from the local copy, but it's still contained in the repository location. It will be deleted the repository after commit action.


SVN Workspace Synchronization_sed_08

A conflict addition icon means, that to different resources with the marked resource name were added both to the repository location and to the local copy.


SVN Workspace Synchronization_SVN_09

A conflict change icon means, that the changes, that can't be merged automatically were made both with local copy and repository one. A manual merge is required. The parents of the decorated resource will be also decorated.


SVN Workspace Synchronization_SVN_10

A conflict deletion icon means, that both local and repository's copy of the resource were deleted.


SVN Workspace Synchronization_SVN_11

A properties change icon means, that the properties of local or repository's resource were changed.

 

Toolbar

Synchronize (

SVN Workspace Synchronization_SVN_12

) - starts synchronization with repository.

Pin Current Synchronization (

SVN Workspace Synchronization_sed_13

) - pins current synchronization, so other started synchronizations will be shown in another synchronization view.

Next difference (

SVN Workspace Synchronization_ide_14

) - shows the next difference of the resources.

Previous difference (

SVN Workspace Synchronization_ico_15

) - shows the previous difference of the resources.

Collapse all (

SVN Workspace Synchronization_ide_16

) - redraws the view collapsing all expanded items.

Expand all (

SVN Workspace Synchronization_ico_17

) - redraws the view expanding all collapsed items.

Incoming mode (

SVN Workspace Synchronization_sed_18

) - redraws the view showing only incoming changes.

Outgoing mode (

SVN Workspace Synchronization_ico_19

) - redraws the view showing only outgoing changes.

Incoming/outgoing mode (

SVN Workspace Synchronization_ico_20

) - redraws the view showing both incoming and outgoing changes.

Conflict mode (

SVN Workspace Synchronization_ico_21

) - redraws the view showing only conflict changes.

Update All Incoming Changes (

SVN Workspace Synchronization_sed_22

) - activates the update action for all incoming changes.

Commit All Outgoing Changes (

SVN Workspace Synchronization_ide_23

) - activates the commit action for all outgoing changes.

Show Change Sets (

SVN Workspace Synchronization_ide_24

) - displays specific model based on change sets. The view shows incoming changes grouped by commit comment which is handy for seeing who released what and why. For outgoing changes, the user can create change sets to group related changes.

Drop-down menu:

  • Pin Current Synchronization (

    SVN Workspace Synchronization_sed_13

    )
    - pins current synchronization.

  • Remove Current Synchronization (

    SVN Workspace Synchronization_ide_26

    )
    - removes current synchronization info from the view.
  • Remove Un-Pined Synchronization (

    SVN Workspace Synchronization_UP_27

    )
    - removes all unpinned synchronizations from the view.
  • Mode - offers the user to choose a synchronization mode (incoming, outgoing, both or conflict).
  • Presentation - offers the user to choose presentation mode (flat, tree, compressed folders).
  • Preferences... - opens Synchronization preferences window.
  • Schedule... - offers to schedule the synchronize operation.
  • Show synchronization info contiguous - shows synchronization for already synchronized resources, while the synchronization process for others is still running at background.

Pop-up menu

Open in compare editor (files only) - opens the file in compare editor with its content on the left and repository file content on the right.

Open (files only) - opens the file with default editor.

Open with... (files only) - opens the file with probability to choose the editor.

Edit - provides a probability to copy, delete, move or rename a resource.

Synchronize - starts synchronization with repository.

Remove from View - removes the selected resource from the view. It will reappear in the view if it's synchronization status changes.

Update - activates the update action for the selected resource.

Commit... - activates the commit action for the selected resource.

Override and update... (

SVN Workspace Synchronization_sed_22

) - replaces the selected resource local copy with a repository one.

Override and commit... (

SVN Workspace Synchronization_ide_23

) - replaces the selected resource repository copy with a local one.

Mark as merged... - mark the file as if it is already merged.

Revert... (

SVN Workspace Synchronization_ico_30

) - reverts the file changes to the unmodified state.

Add to version control... - adds a selected resource to version control.

Add to svn:ignore... - adds a selected resource to svn:ignore.

Create Patch... - creates patch based on local changes.

Branch... (

SVN Workspace Synchronization_ico_31

) - creates branch from working copy.

Show History (

SVN Workspace Synchronization_UP_32

) - shows SVN History View for a selected resource.

Show Annotations - shows annotation for a selected resource.

Show Properties (

SVN Workspace Synchronization_sed_33

) - shows SVN properties of a selected resource.

Set Property... - sets property on local resource.

Set Keywords... - sets keywords on local resource.

Lock... (

SVN Workspace Synchronization_sed_34

) - locks local resource.

Unlock (

SVN Workspace Synchronization_UP_35

) - unlocks local resource.

Clean-up - performs clean-up for selected folder.

 

 

举报

相关推荐

0 条评论