eclipse中svn的各种图标详解

参考:http://blog.sina.com.cn/s/blog_637810b101018xw0.html

- 已忽略版本控制的文件。可以通过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.

时间: 2024-10-12 21:23:19

eclipse中svn的各种图标详解的相关文章

Eclipse中配置python开发环境详解

1.下载python 安装包.python-2.6.6.msi.并安装.默认python会安装在C:\Python26下,查看环境变量,如果没有在path路径中写入则手动添加.打开一个dos窗口,验证python是否安装成功: C:\Documents and Settings\Administrator>python Python 2.6.6 (r266:84297, Aug 24 2010, 18:46:32) [MSC v.1500 32 bit (Intel)] on win32 Typ

Eclipse中使用javap运行配置详解

javap是sun提供的对class文件进行反编译的工具 1.配置Run---external tools---external tools configurations 选择Program 新建javap运行方式 设置location.workspace等选项 如下图: 需要注意的是workspace选择和argument配置 workding directory 设置为${workspace_loc}/${project_name} , Arguments: -c -verbose -cla

SVN中tag branch trunk用法详解

SVN中tag branch trunk用法详解 2010-05-24 18:32 佚名 字号:T | T 本文向大家简单介绍一下SVN中tag branch trunk用法,SVN中tag branch trunk都属于SVN的子命令,那么他们是如何使用的呢,本文就给大家一一讲解. AD:干货来了,不要等!WOT2015 北京站演讲PPT开放下载! 本节主要讲解一下SVN中tag branch trunk的用法,在SVN中Branch/tag在一个功能选项中,在使用中也往往产生混淆.这里就向大

【转】SVN中trunk,branches,tags用法详解

SVN中trunk,branches,tags用法详解 Subversion有一个很标准的目录结构,是这样的.比如项目是proj,svn地址为svn://proj/,那么标准的svn布局是 svn://proj/|+-trunk+-branches+-tags这是一个标准的布局,trunk为主开发目录,branches为分支开发目录,tags为tag存档目录(不允许修 改).但是具体这几个目录应该如何使用,svn并没有明确的规范,更多的还是用户自己的习惯. 对于这几个开发目录,一般的使用方法有两

Eclipse中SVN的安装步骤(两种)和用法

一.给安装EclipseSVN,最常见的有两种方式:手动方式和使用安装向导方式.详细过程例如以下: 方式一:手动安装 1.从官网下载site-1.6.9.zip文件,网址是:subclipse.tigris.org2.从中解压出features与plugins目录,拷贝到E:/MyEclipse/myPlugin/svn里面,其他的*.xml文件不要.3.在E:/MyEclipse/MyEclipse X.X/dropins下新建文件svn.link,内容是:path=E://MyEclipse

使用icomoon字体图标详解

使用icomoon字体图标详解 字体图标的优势:(isux的总结) 1.轻量性:一个图标字体比一系列的图像(特别是在Retina屏中使用双倍图像)要小.一旦图标字体加载了,图标就会马上渲染出来,不需要下载一个图像.可以减少HTTP请求,还可以配合HTML5离线存储做性能优化. 2.灵活性:图标字体可以用过font-size属性设置其任何大小,还可以加各种文字效果,包括颜色.Hover状态.透明度.阴影和翻转等效果.可以在任何背景下显示.使用位图的话,必须得为每个不同大小和不同效果的图像输出一个不

iOS开发——开发实战篇&版本控制SVN和Git使用详解

版本控制SVN和Git使用详解 公司的实际开发中,在天朝使用较多的还是SVN,因为SVN是集中式的,在天朝上班你们都懂的! -----------------svn----------------- 一:最常用基本步骤--- 下载(完整下载,第一次),将服务器的项目下载到本地开始开发 svn checkout ip —uaerbane=? —password=?     //这里需要add 简:co 更新仓库,服务器项目有变动的时候需要更新到本地,以免错误或者冲突 svn updata    

Eclipse中SVN的安装步骤(两种)和使用方法

一.给Eclipse安装SVN,最常见的有两种方式:手动方式和使用安装向导方式.具体步骤如下: 方式一:手动安装 1.从官网下载site-1.6.9.zip文件,网址是:subclipse.tigris.org 2.从中解压出features与plugins文件夹,复制到E:/MyEclipse/myPlugin/svn里面,其它的*.xml文件不要. 3.在E:/MyEclipse/MyEclipse X.X/dropins下新建文件svn.link,内容是:path=E://MyEclips

SVN版本冲突解决详解 - snwrking的专栏 - 博客频道 - CSDN.NET

版本冲突原因: 假设A.B两个用户都在版本号为100的时候,更新了kingtuns.txt这个文件,A用户在修改完成之后提交kingtuns.txt到服务器,这个时候提交成功,这个时候kingtuns.txt文件的版本号已经变成101了.同时B用户在版本号为100的kingtuns.txt文件上作修改,修改完成之后提交到服务器时,由于不是在当前最新的101版本上作的修改,所以导致提交失败. 版本冲突现象: 冲突发生时,subversion会在当前工作目录中保存所有的目标文件版本[上次更新版本.当