svn图标的详细含义(全)
原则: 先更新, 后提交
问号 | Unversioned, 未在版本控制中 | |
黄色的小瓶子 | 项目的版本和服务器里面项目的版本一致 | |
灰色的勾 | 锁定 | |
黑星 | 本地修改未提交的 | |
黑右箭头 | 本地修改过 | |
蓝左箭头 | 服务器端修改过 | |
黑右加箭头 | 本地比服务器多出的 | |
蓝右加箭头形容树的四字词语 | 服务器端比本地多出的 | |
黑右减箭头 | 本地已删除, 服务器未删除 | |
蓝左减箭头 | 服务器已删除, 本地未删除 | |
肝火旺吃什么红双向箭头 | 服务器中修改过, 本地也修改过(出现冲突)的 | |
| 零个未更新好吃的蛋糕 | |
| 唱歌的英语怎么说9个未提交众香 | |
| 零个未提交 | |
| | |
| | |
Tortoi
∙ 项目视图 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. The 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. The are typically files you have either renamed, or moved to a different directory.
- 本地删除的目录。
A deleted folder. The 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 en with this icon.
- 没有任何改动的文件。
A file with no local changes.
- 发生改动，尚未提交的文件。
A file with local, uncommitted changes.
- 处于锁定状态的文件。
海带炖豆腐A locked file.
- 有冲突没有解决，就更新或提交的文件。
A conflicted file. The are typically files that had a commit/update conflict that you marked to resolve later.
- 有目录树冲突的文件。一般在最近一次更新后，资源库上的文件被移动、删除或重命名。
A file that has a tree conflict. The 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. The are files which belongs to a different working copy than their local parent directory.
∙ 迁出 Outgoing view
- 本地有更改的文件。
A file who 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 cas where a file is moved or renamed..
- 本地删除的文件。
A file that will be removed from the repository. This may coincide with a file addition in cas 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 becau 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 lected repository when clicked. Selecting from the drop-down allows switching between different remote code bas.
- 只显示需要迁入的文件。
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.
What do the arrow icons in Subclip mean?
When working with the Subversion repository, remote changes (tho on the repository) are incoming changes (remote → local), while local changes are outgoing changes (local → remote).
In views that compare the local and remote copies, incoming changes are denoted with a
blue, left-facing arrow, while outgoing changes are denoted with a gray, right-facing arrow. The arrows may be decorated to indicate more specific operations.
