本文转载自:http://blog.sina.com.cn/s/blog_a181f2f90101cnch.html
正文内容如下:
-
已忽略版本控制的文件。可以通过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.
-未纳入版本控制的文件,一般是新增,尚未提交的文件。
A file not underversion control. These are typically new files that you have notcommitted to the repository yet.
-
本地重命名或移动到其它目录的文件。
A versionedfile that needs to be added to the remote repository. These aretypically files you have either renamed, or moved to a differentdirectory.
-
本地删除的目录。
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.
-
没有任何改动的文件。
A file with no localchanges.
-
发生改动,尚未提交的文件。
A file withlocal, uncommitted changes.
-处于锁定状态的文件,其他人不可修改,文件对于其他人来说,处于只读状态,默认情况是,自己修改后提交,同时文件也解锁。
A locked file.
-
有冲突没有解决,就更新或提交的文件。
A conflictedfile. These are typically files that had a commit/update conflictthat you marked to resolve later.
-有目录树冲突的文件。一般在最近一次更新后,资源库上的文件被移动、删除或重命名。
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.