一些常见svn图标的含义

http://my.oschina.net/coda/blog/33678

 

• 迁入 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.

 

 

 

• 迁出 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 ().

 

 

 

• 冲突 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.