本文轉載自:http://blog.sina.com.cn/s/blog_a181f2f90101cnch.htmlhtml
正文內容以下:app
- 已忽略版本控制的文件。能夠經過Window → Preferences → Team →Ignored Resources.來忽略文件。
A file ignored by versioncontrol. You can control what resources will be ignored by going toWindow → Preferences → Team → Ignored Resources.ide
-未歸入版本控制的文件,通常是新增,還沒有提交的文件。
A file not underversion control. These are typically new files that you have notcommitted to the repository yet.this
- 本地重命名或移動到其它目錄的文件。
A versionedfile that needs to be added to the remote repository. These aretypically files you have either renamed, or moved to a differentdirectory.spa
- 本地刪除的目錄。
A deleted folder.These are folders that you have deleted locally without yetcommitting the changes to the repository. Note that files areusually removed from the view when they're deleted locally, so theyare normally not seen with this icon..net
- 沒有任何改動的文件。
A file with no localchanges.版本控制
- 發生改動,還沒有提交的文件。
A file withlocal, uncommitted changes.code
-處於鎖定狀態的文件,其餘人不可修改,文件對於其餘人來講,處於只讀狀態,默認狀況是,本身修改後提交,同時文件也解鎖。
A locked file.orm
- 有衝突沒有解決,就更新或提交的文件。
A conflictedfile. These are typically files that had a commit/update conflictthat you marked to resolve later.htm
-有目錄樹衝突的文件。通常在最近一次更新後,資源庫上的文件被移動、刪除或重命名。
A file thathas a tree conflict. These are typically files that have localchanges, but have since been moved, removed, or renamed in therepository since the last local copy update.
- 引用外部項目的文件,不能提交到本項目的資源庫裏。
A file that is external tothe project. Linked external files cannot be committed to therepository.
-有分支版本的文件。這些文件屬於另一個不一樣的工做目錄而不是屬於本地的父目錄。
A file thathas been switched. These are files which belongs to a differentworking copy than their local parent directory.
- 本地有更改的文件。
A file whose contents havebeen modified and will be committed to the repository.
- 本地新增的文件。
Afile that will be newly added to the repository. This may coincidewith a file removal in cases where a file is moved or renamed..
- 本地刪除的文件。
A file that will beremoved from the repository. This may coincide with a file additionin cases where a file is moved or renamed.
- 本地文件屬性發生變化了的文件。
A file withproperty changes, in the Commit dialog. On the Synchronize tab,property changes are currently reflected as a normal filemodification ().
- 須要更新的文件。
A file that has contentchanges committed to the repository that will be applied to thelocal copy.
- 須要遷入的新增文件。
A new file that willbe added to the local copy from the repository. Like the outgoingfile addition, this may be the result of a move or rename.
- 資源庫中刪除了的文件。
A file that will beremoved from the local copy because it has been removed from therepository. Like the outgoing file removal, this may be the resultof a move or rename.
- 資源庫和本地同時有修改的文件。
A file that hasbeen changed in both the local copy and repository independently,causing a need for conflict resolution. Fixing this conditioninvolves opening up the conflict view or forcibly overwritingchanges locally or remotely.
- 遠程資源庫上已經被重命名或移動、刪除的文件。
A filethat has a tree conflict. This can occur when there are new changesto a file on one end (either local or remote), and the file ismoved, removed, or renamed on the other.
Finally, the Synchronize with Repository option opens theSynchronize tab () with the following buttons:
- 同步選中的文件,下拉箭頭切換不一樣的遠程目錄。
Synchronizes the local copy with the currently selected repositorywhen clicked. Selecting from the drop-down allows switching betweendifferent 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 afterprompt.
Brings up the commit dialog to commit all outgoing changes.