-
svn
图标的详细含义
(
全
)
原则
:
先更新
,
后提交
问号
Unversioned,
未在版本控制中
项目的版本和服务器
里面项目的版
本一致
锁定
本地修改未提交的
黑星
黑右箭头
蓝左箭头
黑右加箭头
蓝右加箭头
黑右减箭头
蓝左减箭头
红双向箭头
本地修改过
服务器端修改过
本地比服务器多出的
服务器端比本地多出的
本地已删除
,
服务器未删除
服务器已删除
,
本地未删除
服务器中修改过
,
本地也修改过
p>
(
出
现冲突
)
p>
的
零个未更新
9
个未提交
零个未提交
黄色的小瓶子
灰色的勾
Tortoise
?
项目视图
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.
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.
-
需要迁入的新增文件。
-
-
-
-
-
-
-
-
-
上一篇:nmon使用说明书
下一篇:itunes功能介绍