原文地址:http://yidishui.cnblogs.com/archive/2005/11/19/280195.aspx
Synchronization state
The synchronize view shows the synchronization state of resources in your workspace compared to those in the repository. This state is shown by using icons and can also be configured to show the state as text appended to the resource name. A description of the icons is shown in the table below:
指向左边的蓝色箭头包含加号 An incoming addition means that a resource has been added to the repository. Updating will transfer the resource to your workspace.
指向左边的蓝色箭头 An incoming change means that the file has changed in the repository. Updating will transfer the new file revision to your workspace.
指向左边的蓝色箭头包含减号 An incoming deletion means that a resource was deleted from the server. Updating will delete your local resource.
指向右边的黑色箭头包含加号 An outgoing addition means that the file was added to your workspace and is not yet in the repository. Adding then Committing will transfer the new file to the repository.
指向右边的黑色箭头 An outgoing change means that the file was change locally. Committing the file will transfer the changes to the repository and create a new revision of the file.
指向右边的黑色箭头包含减号 An outgoing deletion is a resource that has been deleted locally. Committing these resources will cause the remote resource to be deleted. Note: in CVS directories are never really deleted from the repository. Instead, files are deleted and empty directories are pruned from your workspace.
红色双向箭头包含加号 A conflicting additions means that the resource has been added locally and remotely.
红色双向箭头 A conflicting change means that the file has been changed locally and remotely. A manual or automatic merge will be required by the user. Also, any entries in the view that contain children that are conflicts will also be decorated with the comflict icon. This is done to make conflicts easy to find.
红色双向箭头包含减号 A conflicting deletion means that the resource was deleted locally and remotely.
---------------------------------------------------------------
Synchronization state同步状态
同步状态
同步视图显示你的本地工作平台与服务器存储库中资源的同步状态。状态按图标显示,你也可以把状态显示配置为资源名称之后的文字。下表列出图标的描述。
指向左边的蓝色箭头包含加号,引入新增——表示一项资源已经被加入到服务器。点更新键会把资源传递到本地上。
指向左边的蓝色箭头 引入变化——表示服务器中的资源已经变化。点更新键会把新文件传递到本地。
指向左边的蓝色箭头包含减号 引入删除——表示服务器的资源已被删除。点更新键会删除你本地的资源
指向右边的黑色箭头包含加号 输出增加——表示你本地有新增加的文件,而服务器中没有。添加提交键会把新文件传到服务器上。
指向右边的黑色箭头 输出变化——表示本地的文件已经改变。提交文件会把变化传入服务器并创建文件的一个新版本。
指向右边的黑色箭头包含减号 输出删除——表示本地文件已经删除。提交这些资源会删除远程资源。注意:在CVS中目录不会从服务器中真正的删除。而只是把文件删除,在你本地除去空文件夹。
红色双向箭头包含加号 冲突增加——表示本地和远程都新增加了资源
红色双向箭头 冲突变化——表示本地和远程都有文件变化。用户需要手工合并或者自动合并。同时,包含有冲突文件的上级视图也同时被显示为冲突,这样做是为了让冲突更容易找到。
红色双向箭头包含减号 冲突删除——表示本地和远程的文件都被删除。