常見的SVN圖標

  • 項目視圖 The Package Explorer view

- 已忽略版本控制的文件。可以通過Window → Preferences → Team → Ignored Resources.來忽略文件。
A file ignored by version control. You can control what resources will be ignored by going to Window → Preferences → Team → Ignored Resources.

 - 未納入版本控制的文件,一般是新增,尚未提交的文件。
A file not under version control. These are typically new files that you have not committed to the repository yet.

- 本地重命名或移動到其它目錄的文件。
A versioned file that needs to be added to the remote repository. These are typically files you have either renamed, or moved to a different directory.

- 本地刪除的目錄。
A deleted folder. These are folders that you have deleted locally without yet committing the changes to the repository. Note that files are usually removed from the view when they're deleted locally, so they are normally not seen with this icon.

- 沒有任何改動的文件。
A file with no local changes.

- 發生改動,尚未提交的文件。
A file with local, uncommitted changes.

- 處於鎖定狀態的文件。
A locked file.

- 有衝突沒有解決,就更新或提交的文件。
A conflicted file. These are typically files that had a commit/update conflict that you marked to resolve later.

 - 有目錄樹衝突的文件。一般在最近一次更新後,資源庫上的文件被移動、刪除或重命名。
A file that has a tree conflict. These are typically files that have local changes, but have since been moved, removed, or renamed in the repository since the last local copy update.

- 引用外部項目的文件,不能提交到本項目的資源庫裏。
A file that is external to the project. Linked external files cannot be committed to the repository.

- 有分支版本的文件。這些文件屬於另外一個不同的工作目錄而不是屬於本地的父目錄。
A file that has been switched. These are files which belongs to a different working copy than their local parent directory.

  • 遷出 Outgoing view

- 本地有更改的文件。
A file whose contents have been modified and will be committed to the repository.

- 本地新增的文件。
A file that will be newly added to the repository. This may coincide with a file removal in cases where a file is moved or renamed..

- 本地刪除的文件。
A file that will be removed from the repository. This may coincide with a file addition in cases where a file is moved or renamed.

- 本地文件屬性發生變化了的文件。
A file with property changes, in the Commit dialog. On the Synchronize tab, property changes are currently reflected as a normal file modification ().

  • 遷入 Incoming view

- 需要更新的文件。 
A file that has content changes committed to the repository that will be applied to the local copy.

- 需要遷入的新增文件。
A new file that will be added to the local copy from the repository. Like the outgoing file addition, this may be the result of a move or rename.

- 資源庫中刪除了的文件。
A file that will be removed from the local copy because it has been removed from the repository. Like the outgoing file removal, this may be the result of a move or rename.

  • 衝突 Conflict view

- 資源庫和本地同時有修改的文件。
A file that has been changed in both the local copy and repository independently, causing a need for conflict resolution. Fixing this condition involves opening up the conflict view or forcibly overwriting changes locally or remotely.

- 遠程資源庫上已經被重命名或移動、刪除的文件。 
A file that has a tree conflict. This can occur when there are new changes to a file on one end (either local or remote), and the file is moved, removed, or renamed on the other.

  • “與資源庫同步”選項打開的界面上的一些按鈕 Others :

Finally, the Synchronize with Repository option opens the Synchronize tab () with the following buttons:

- 同步選中的文件,下拉箭頭切換不同的遠程目錄。
Synchronizes the local copy with the currently selected repository when clicked. Selecting from the drop-down allows switching between different remote code bases.

- 只顯示需要遷入的文件。

Shows only incoming changes (remote → local).

 - 只顯示需要提交的文件。

Shows only outgoing changes (local → remote).

- 同時顯示需要更新或提交文件。

Shows both incoming and outgoing changes (remote ↔ local).

- 只顯示有衝突的文件。

Shows conflicting changes.

- 更新全部文件。

Updates all local resources with incoming changes after prompt.

- 提交全部文件。

Brings up the commit dialog to commit all outgoing changes.

發表評論
所有評論
還沒有人評論,想成為第一個評論的人麼? 請在上方評論欄輸入並且點擊發布.
相關文章