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中目錄不會從伺服器中真正的刪除。而只是把檔案刪除,在你本地除去空檔案夾。
紅色雙向箭頭包含加號 衝突增加——表示本地和遠程都新增加了資源
紅色雙向箭頭 衝突變化——表示本地和遠程都有檔案變化。使用者需要手工合并或者自動合并。同時,包含有衝突檔案的上級視圖也同時被顯示為衝突,這樣做是為了讓衝突更容易找到。
紅色雙向箭頭包含減號 衝突刪除——表示本地和遠端檔案都被刪除。