The Working Copy view allows you to manage the content of an SVN
working copy.
The toolbar contains the list of defined working copies, a set of view modes that allow
you to filter the content of the working copy based on the resource status (like
incoming or outgoing changes), and a Settings menu.
If you click any of the view modes (All Files, Modified, Incoming, Outgoing, Conflicts),
the information displayed changes as follows:
Working Copy View - Modified View Mode
Incoming -
The resource tree presents only incoming changes.
Outgoing -
The resource tree presents only outgoing changes.
Conflicts -
The resource tree presents only conflicting changes (real conflicts,
pseudo-conflicts and files in the Name
conflict state).
The following columns provide information about the resources:
- Name - Resource name. Resource icons can have the
following decorator icons:
- Additional status information:
-
Propagated modification marker - A
folder marked with this icon indicates that the folder
itself presents some changes (like modified properties) or a
child resource has been modified.
-
External - This indicates a mapping
of a local directory to the URL of a versioned resource. It
is declared with a svn:externals property in the
parent folder.
-
Switched - This
indicates a resource that has been switched from the initial
repository location to a new location within the same
repository. The resource goes to this state as a result of
the Switch
action executed from the contextual menu of the
Working Copy view.
-
Grayed - A resource with a grayed icon but no
overlaid icon is an ignored resource. It is obtained with
the Add to svn:ignore action.
-
Current SVN depth of a folder:
-
Immediate children (immediates) (a
variant of sparse
checkout) - The directory contains only direct
file and folder children. Child folders ignore their
content.
-
File children only (files) (a variant
of sparse
checkout) - The directory contains only direct file
children, disregarding any child folders.
-
This folder only (empty) (a variant
of sparse
checkout) - The directory will discard any child
resource.
Note: Any folder
not
marked with one of the depth icons, has recursive depth (infinity)
set by default (presents all levels of child resources).
- Size - Resource size on disk;
Local
file status - Shows the changes of working copy resources that
were not committed to the repository yet. The following icons are used to mark
resource status:
- Resource is not
under version control.
- Resource is being
ignored because it is not under version control and its
name matches a file name pattern defined in one of the following places:
- Marks a newly created
resource, scheduled for addition to the version control
system.
- Marks a resource
scheduled for addition, created by copying a resource
already under version control and inheriting all its SVN history.
- The content of the
resource has been modified.
- Resource has been
replaced in your working copy (the file was scheduled
for deletion, and then a new file with the same name was scheduled for
addition in its place).
- Resource is
scheduled for deletion.
- The resource is
incomplete (as a result of an interrupted
checkout or update operation).
- The resource is
missing because it was moved or deleted without using a
SVN aware application.
- The contents of the
resource is in real conflict state.
- Resource is in
tree conflict state after an update operation because:
- Resource was locally modified and incoming deleted from
repository;
- Resource was locally scheduled for deletion and incoming
modified.
- Resource is
obstructed (versioned as one kind of object: file,
directory or symbolic link, but has been replaced outside Syncro SVN
Client by a different kind of object).
- Resource is in name conflict state (only on
case insensitive systems like Windows). This happens when two files having the same
name (ignoring letter-cases) exist in the same repository folder (for example
file.txt and File.txt). The two files were
added to repository from a case-sensitive operating system like Linux or Mac OS X.
This state is reported after an update operation and most of the Apache SubversionTM operations
cannot be performed over such files. The solution is to rename one of the files from a
case-sensitive operating system or directly from the
Repositories view in order to have the files with completely
different names.
Local
properties status - Marks the resources that have SVN
properties, with the following possible states:
- The resource has SVN
properties set.
- The resource
properties have been modified.
- Properties for this
resource are in real conflict with property updates received
from the repository.
- Date - Date when the resource was last time
modified.
- Revision - The revision number at which the resource was
last time modified.
- Author - Name of the person who made the last
modification on the resource.
Lock information - Shows the lock state of a resource. The lock
mechanism is a convention intended to help you signal other users that you are
working with a particular set of files. It minimizes the time and effort wasted
in solving possible conflicts generated by clashing commits. A lock gives you
exclusive rights over a file, only if other users follow this convention and
they do not try to bypass the lock state of a file. A folder can be locked
only by the SVN client application, completely transparent to the user, if
an operation in progress was interrupted unexpectedly. As a result, folders
affected by the operation are marked with the
symbol. To
clear the locked state of a folder, use the Cleanup
action.
Note: Users can lock only files.
The following lock states are displayed:
- no lock - the file is not locked. This is the default state of a
file in the SVN repository;
- remotely locked (
) - shown when:
- another user has locked the file in the repository;
- the file was locked by the same user from another working
copy;
- the file was locked from the Repositories
view.
If you try to commit a new revision of the file to the repository,
the server does not allow you to bypass the file lock.
Note: To commit a new revision you need to wait for the file to be
unlocked. Ultimately, you might try to break or
steal the lock, but this is not what other users
expect. Use these actions carefully, especially when you are not
the file lock owner.
- locked (
) - displayed after you have locked a file
from the current working copy. Now you have exclusive rights over the
corresponding file, being the only one who can commit changes to the
file in the repository.Note: Working copies keep track of their locked
files, so the locks will be presented between different sessions of
the application. You should synchronize your working copy with the
repository in order to make sure that the locks are still valid (not
stolen or broken).
- stolen (
) - a file already locked from your working
copy is being locked by another user. Now the owner of the file lock is
the user who stole the lock from you.
- broken (
) - a file already locked from your working
copy is no longer locked in the repository (it was unlocked by another
user).Note: To remove the stolen or broken states from
your working copy files, you have to Update
them.
If one of your working copy files is locked, hover the mouse pointer
over the lock icon to see more information:
- lock type - current file lock state;
- owner - the name of the user who created the lock;
- date - the date when the user locked the file;
- expires on - date when the lock expires. Lock expiry policy is set
in the repository options, on the server side;
- comment - the message attached when the file was locked.
Remote
file status - Shows changes of resources recently modified in
the repository. The following icons are used to mark incoming resource status:
- Resource is newly
added in repository.
- The content of the
resource has been modified in repository.
- Resource was
replaced in repository.
- Resource was deleted
from repository.
Remote properties status - Resources marked with the
icon have incoming modified
properties from the repository.
- Remote date - Date of the resource's latest modification
committed on the repository.
- Remote revision - Revision number of the resource's
latest committed modification.
- Remote author - Name of the author who committed the
latest modification on the repository.
- Type - Contains the resource type or file extension.
Note: The working copy table allows you to show or hide any of its columns and also to
sort its contents by any of the displayed columns. The table header provides a
contextual menu which allows you to customize the displayed information.
The toolbar allows you to switch between two working copies:
-
Drop down list - Contains all the working copies Syncro SVN Client is aware
of. When you select another working copy from the list, the newly selected
working copy content will be scanned and displayed in the Working
Copy view.
-
Add/Remove Working Copy - opens the Working
copies list dialog which displays the working copies Syncro SVN Client is aware
of. In this dialog you can add existing working copies or remove the no longer
needed ones. If you try to add a folder which is not a valid Subversion working
copy, a warning dialog will inform you that the selected directory is not under
version control. Please note that removing a working copy from this dialog will
NOT remove it from your file system; you will have to do that manually.