cvs操作服务器返回的几种状态解释

从TortoiseCVS帮助中取得的下面信息,相信对于cvs服务器应该是通用的:

This 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
文件在cvs服务器和本地都发生了改变。cvs工具试图合并两边的变化在本地的文件中,但是不能完成合并(因为两边的变化发生在同一段文本中),工具无法解决冲突。

M
The file has only changed on the local PC. TortoiseCVS will not change the local copy.
文件仅在本地发生了改变,cvs工具不改变本地文件。

P
The file has changed in CVS, and TortoiseCVS has updated the local copy to match
cvs服务器上的文件发生改变,cvs工具将更新到本地版本。

U
The file exists in CVS, but not on the local machine. TortoiseCVS will create a copy on the local PC.
文件在cvs服务器上存在,但本地机器不存在。cvs工具将创建一个copy在本地机器上。

你可能感兴趣的:(服务器,File,dialog,cvs,工具,merge)