Progress Dialog

Figure?6.7.?Progress Dialog

This dialog shows each CVS command that TortoiseCVS executes, as well as any information, errors, or warnings generated by CVS. The different types of messages are highlighted in different colours (you can customize these colours using the Appearance tab in the Preferences dialog).
During an Update, the Progress Dialog indicates whether or not each file has changed in CVS or on the local PC, using the following single-letter codes:
C
The file has changed both in CVS and locally. TortoiseCVS attempted to merge both sets of changes into the local copy, but could not (probably because both changes were made to the same part of the file). For more information, see Resolving Conflicts.
M
The file has only changed on the local PC. TortoiseCVS will not change the local copy.
P
The file has changed in CVS, and TortoiseCVS has updated the local copy to match
U
The file exists in CVS, but not on the local machine. TortoiseCVS will create a copy on the local PC. You will also see this for files which have changed in CVS (as for U.
A
The file has been added to CVS, but not yet committed.
R
The file has been removed from CVS, but not yet committed.
进度对话框

Figure?6.7.?进度对话框

对话框显示TCVS运行的每个CVS命令的信息，包括CVS命令产生的运行信息、错误、警告，不同的命令类型用不同的高亮标识，你可以定制这些颜色（属性对话框－外观） Appearance .
Update, 在更新过程中，进度对话框指示每个文件是在CVS中被修改还是在本地被修改，用如下字母标志:
C
这个文件在CVS和本地都被修改，TCVS尝试合并双方的修改到本地文件中，但是失败（可能由于双方修改了文件的同一部分）更多信息 合并冲突 Resolving Conflicts.
M
本地文件被修改，TCVS不会改变本地文件.
P
CVS仓库文件修改, TCVS将更新本地文件
U
文件存在仓库中，不存在于本地，TCVS将创建本地拷贝，有时还可能是CVS仓库中的文件已经被修改更新.
A
文件加入CVS，但是没有提交.
R
文件被标明移除，但是没有提交.

About Dialog

Figure?6.19.?About Dialog

The About dialog shows the version of TortoiseCVS itself as well as the CVS client it uses, and the SSH application you have configured.
TODO: Describe and show dialog with and without CVS server version
关于对话框

Figure?6.19.?关于对话框

关于对话框显示TCVS的版本信息以及CVS客户端版本信息，你配置的SSH程序信息
TODO: 描述并显示对话框（有无服务器版本信息）

历史博文

标签：, , ,
七月 18, 2005 at 9:22 下午 by yippee 1,034 次
Category: English
Tags: , , ,