﻿<?xml version="1.0" encoding="utf-8" standalone="yes"?><rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/" xmlns:wfw="http://wellformedweb.org/CommentAPI/" xmlns:slash="http://purl.org/rss/1.0/modules/slash/"><channel><title>BlogJava-fanscial-随笔分类-Java</title><link>http://www.blogjava.net/fanscial/category/6054.html</link><description /><language>zh-cn</language><lastBuildDate>Wed, 28 Feb 2007 03:45:32 GMT</lastBuildDate><pubDate>Wed, 28 Feb 2007 03:45:32 GMT</pubDate><ttl>60</ttl><item><title>Solaris下CVS常用命令</title><link>http://www.blogjava.net/fanscial/archive/2006/04/05/39448.html</link><dc:creator>fanta</dc:creator><author>fanta</author><pubDate>Wed, 05 Apr 2006 11:03:00 GMT</pubDate><guid>http://www.blogjava.net/fanscial/archive/2006/04/05/39448.html</guid><wfw:comment>http://www.blogjava.net/fanscial/comments/39448.html</wfw:comment><comments>http://www.blogjava.net/fanscial/archive/2006/04/05/39448.html#Feedback</comments><slash:comments>3</slash:comments><wfw:commentRss>http://www.blogjava.net/fanscial/comments/commentRss/39448.html</wfw:commentRss><trackback:ping>http://www.blogjava.net/fanscial/services/trackbacks/39448.html</trackback:ping><description><![CDATA[
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21pt; TEXT-INDENT: -21pt; mso-outline-level: 2; mso-list: l1 level1 lfo1; tab-stops: list 21.0pt">
				<a name="init">
						<b style="mso-bidi-font-weight: normal">
								<span lang="EN-US" style="FONT-SIZE: 12pt; mso-fareast-font-family: 'Times New Roman'">
										<span style="mso-list: Ignore">1.<span style="FONT: 7pt 'Times New Roman'">        </span></span>
								</span>
						</b>
						<b>
								<span lang="EN-US">CVS</span>
						</b>
				</a>
				<span style="mso-bookmark: init">
						<b>
								<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">环境初始化</span>
						</b>
				</span>
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">
								<?xml:namespace prefix = o ns = "urn:schemas-microsoft-com:office:office" /?>
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 49.6pt; TEXT-INDENT: -1cm; mso-outline-level: 3; mso-list: l1 level2 lfo1; tab-stops: list 49.6pt">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US" style="FONT-SIZE: 12pt; mso-fareast-font-family: 'Times New Roman'">
								<span style="mso-list: Ignore">1.1<span style="FONT: 7pt 'Times New Roman'">         </span></span>
						</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">指定</span>
						<span lang="EN-US">CVS</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">库的路径</span>
						<span lang="EN-US">CVSROOT<o:p></o:p></span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.25pt; mso-outline-level: 3">
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">在使用用户名和密码登陆后，使用命令</span>
				<span lang="EN-US" style="COLOR: red">vi </span>
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US" style="FONT-SIZE: 16pt; COLOR: red">.</span>
				</b>
				<span lang="EN-US" style="COLOR: red">bash_profile</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.25pt; mso-outline-level: 3">
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">然后在最后一行添加</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.25pt; mso-outline-level: 3">
				<span lang="EN-US">CVSROOT</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">＝：</span>
				<span lang="EN-US">pserver</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">：</span>
				<span lang="EN-US">
						<a href="mailto:username@172.16.1.3">username@172.16.1.3</a>
				</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">：</span>
				<span lang="EN-US">/app</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.25pt; mso-outline-level: 3">
				<span lang="EN-US">export CVSROOT</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.25pt; mso-outline-level: 3">
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">保存后退出（命令见</span>
				<span lang="EN-US">vi</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">的培训文档）</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.25pt; mso-outline-level: 3">
				<span lang="EN-US">Logout</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">后重新登陆</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.25pt; mso-outline-level: 3">
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">输入命令</span>
				<span lang="EN-US">set <span style="mso-spacerun: yes"> </span>| <span style="mso-spacerun: yes"> </span>pg</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">可以查看当前的环境变量，是否已经有</span>
				<span lang="EN-US">CVSROOT</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">这一项</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21pt; TEXT-INDENT: -21pt; mso-outline-level: 2; mso-list: l1 level1 lfo1; tab-stops: list 21.0pt">
				<a name="daily">
						<b style="mso-bidi-font-weight: normal">
								<span lang="EN-US" style="FONT-SIZE: 12pt; mso-fareast-font-family: 'Times New Roman'">
										<span style="mso-list: Ignore">2.<span style="FONT: 7pt 'Times New Roman'">        </span></span>
								</span>
						</b>
						<b>
								<span lang="EN-US">CVS</span>
						</b>
				</a>
				<span style="mso-bookmark: daily">
						<b>
								<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">的</span>
						</b>
				</span>
				<b>
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">常用命令</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 49.6pt; TEXT-INDENT: -1cm; mso-outline-level: 2; mso-list: l1 level2 lfo1; tab-stops: list 49.6pt">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US" style="FONT-SIZE: 12pt; mso-fareast-font-family: 'Times New Roman'">
								<span style="mso-list: Ignore">2.1<span style="FONT: 7pt 'Times New Roman'">         </span></span>
						</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">登陆</span>
						<span lang="EN-US">CVS</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">服务器</span>
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.25pt; mso-outline-level: 2">
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">命令：</span>
				</b>
				<span lang="EN-US">cvs<span style="mso-spacerun: yes">  </span>login</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.25pt; mso-outline-level: 2">
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">系统会提示你输入密码，输入正确后，就可以正常使用</span>
						<span lang="EN-US">cvs</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">的其他命令了</span>
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 49.6pt; TEXT-INDENT: -1cm; mso-outline-level: 2; mso-list: l1 level2 lfo1; tab-stops: list 49.6pt">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US" style="FONT-SIZE: 12pt; mso-fareast-font-family: 'Times New Roman'">
								<span style="mso-list: Ignore">2.2<span style="FONT: 7pt 'Times New Roman'">         </span></span>
						</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">项目首次导入</span>
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.25pt; mso-outline-level: 2">
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">命令：</span>
				</b>
				<span lang="EN-US">cvs import -m "write some comments here" project_name vender_tag r_tag<b style="mso-bidi-font-weight: normal"><o:p></o:p></b></span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 49.6pt; TEXT-INDENT: -1cm; mso-outline-level: 2; mso-list: l1 level2 lfo1; tab-stops: list 49.6pt">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US" style="FONT-SIZE: 12pt; mso-fareast-font-family: 'Times New Roman'">
								<span style="mso-list: Ignore">2.3<span style="FONT: 7pt 'Times New Roman'">         </span></span>
						</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">项目导出：将代码从</span>
						<span lang="EN-US">CVS</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">库里导出</span>
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.25pt; mso-outline-level: 2">
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">命令：</span>
				</b>
				<span lang="EN-US">cvs checkout project_name</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 49.6pt; TEXT-INDENT: -1cm; mso-outline-level: 2; mso-list: l1 level2 lfo1; tab-stops: list 49.6pt">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US" style="FONT-SIZE: 12pt; mso-fareast-font-family: 'Times New Roman'">
								<span style="mso-list: Ignore">2.4<span style="FONT: 7pt 'Times New Roman'">         </span></span>
						</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">提交修改后的代码</span>
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.25pt; mso-outline-level: 2">
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">命令：</span>
				</b>
				<span lang="EN-US">cvs commit -m "write some comments here" file_name<b style="mso-bidi-font-weight: normal"><o:p></o:p></b></span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.25pt; mso-outline-level: 2">
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-bidi-font-style: italic">注意：</span>
				</b>
				<span lang="EN-US" style="FONT-FAMILY: 宋体; mso-bidi-font-style: italic">CVS</span>
				<span style="FONT-FAMILY: 宋体; mso-bidi-font-style: italic">的很多动作都是通过<span lang="EN-US">cvs commit</span>进行最后确认并修改的，在确认的前，还需要用户填写修改注释，以帮助其他开发人员了解修改的原因。如果不用写<span lang="EN-US">-m "comments"</span>而直接确认<span lang="EN-US">`cvs commit file_name` </span>的话，<span lang="EN-US">cvs</span>会自动调用系统缺省的文字编辑器<span lang="EN-US">(</span>一般是<span lang="EN-US">vi)</span>要求你写入注释。</span>
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US" style="FONT-FAMILY: 宋体">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 49.6pt; TEXT-INDENT: -1cm; mso-outline-level: 2; mso-list: l1 level2 lfo1; tab-stops: list 49.6pt">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US" style="FONT-SIZE: 12pt; mso-fareast-font-family: 'Times New Roman'">
								<span style="mso-list: Ignore">2.5<span style="FONT: 7pt 'Times New Roman'">         </span></span>
						</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">同步项目</span>
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.25pt; mso-outline-level: 2">
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">命令：</span>
				</b>
				<span lang="EN-US">cvs update -m "write some comments here" file_name|dir|none</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.25pt; mso-outline-level: 2">
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-bidi-font-style: italic">注意：</span>
				</b>
				<span style="FONT-FAMILY: 宋体; mso-bidi-font-style: italic">不要使用项目首次导出后，以后就要用<span lang="EN-US">cvs update</span>在导出的项目目录下进行同步了，而不是每次重新<span lang="EN-US">cvs checkout</span>来同步文件了。如果导出后修改了文件，然后再次从导出的项目目录的上一级<span lang="EN-US">cvs checkout proj</span>等于是删除了<span lang="EN-US">proj</span>目录然后重新导出，上次导出后的修改就全丢了。</span>
				<span lang="EN-US" style="FONT-FAMILY: 宋体">
						<o:p>
						</o:p>
				</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 49.6pt; TEXT-INDENT: -1cm; mso-outline-level: 2; mso-list: l1 level2 lfo1; tab-stops: list 49.6pt">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US" style="FONT-SIZE: 12pt; mso-fareast-font-family: 'Times New Roman'">
								<span style="mso-list: Ignore">2.6<span style="FONT: 7pt 'Times New Roman'">         </span></span>
						</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">删除文件</span>
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.25pt; mso-outline-level: 2">
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">命令：</span>
				<span lang="EN-US">cvs rm file_name<b style="mso-bidi-font-weight: normal"><o:p></o:p></b></span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 49.6pt; TEXT-INDENT: -1cm; mso-outline-level: 2; mso-list: l1 level2 lfo1; tab-stops: list 49.6pt">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US" style="FONT-SIZE: 12pt; mso-fareast-font-family: 'Times New Roman'">
								<span style="mso-list: Ignore">2.7<span style="FONT: 7pt 'Times New Roman'">         </span></span>
						</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">添加文件</span>
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.25pt; mso-outline-level: 2">
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">命令：</span>
				</b>
				<span lang="EN-US">cvs add new_file</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.25pt; mso-outline-level: 2">
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">注意：文件必须先添加，然后才能提交</span>
						<span lang="EN-US">commit<o:p></o:p></span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 49.6pt; TEXT-INDENT: -1cm; mso-outline-level: 2; mso-list: l1 level2 lfo1; tab-stops: list 49.6pt">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US" style="FONT-SIZE: 12pt; mso-fareast-font-family: 'Times New Roman'">
								<span style="mso-list: Ignore">2.8<span style="FONT: 7pt 'Times New Roman'">         </span></span>
						</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">查看历史</span>
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.25pt; mso-outline-level: 2">
				<span lang="EN-US">cvs log file_name<br />cvs history file_name</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 49.6pt; TEXT-INDENT: -1cm; mso-outline-level: 2; mso-list: l1 level2 lfo1; tab-stops: list 49.6pt">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US" style="FONT-SIZE: 12pt; mso-fareast-font-family: 'Times New Roman'">
								<span style="mso-list: Ignore">2.9<span style="FONT: 7pt 'Times New Roman'">         </span></span>
						</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">查看本地文件与服务器文件的不同</span>
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.25pt; mso-outline-level: 2">
				<span lang="EN-US">cvs diff filename</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21pt; TEXT-INDENT: -21pt; mso-outline-level: 2; mso-list: l1 level1 lfo1; tab-stops: list 21.0pt">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US" style="FONT-SIZE: 12pt; mso-fareast-font-family: 'Times New Roman'">
								<span style="mso-list: Ignore">3.<span style="FONT: 7pt 'Times New Roman'">        </span></span>
						</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">项目</span>
						<span lang="EN-US">CVS</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">日常工作流程</span>
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 42pt; TEXT-INDENT: -21pt; mso-outline-level: 2; mso-list: l0 level1 lfo2; tab-stops: list 42.0pt">
				<span lang="EN-US" style="mso-fareast-font-family: 'Times New Roman'">
						<span style="mso-list: Ignore">1.<span style="FONT: 7pt 'Times New Roman'">         </span></span>
				</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">开始加入项目</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 27pt; TEXT-INDENT: 21pt; mso-outline-level: 2; mso-para-margin-left: 2.57gd; mso-char-indent-count: 2.0">
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">首先在设置完</span>
				<span lang="EN-US">CVSROOT</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">和登陆完以后，在自己的工作目录下面</span>
				<span lang="EN-US">checkout</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">项目</span>
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 27pt; TEXT-INDENT: 20.65pt; mso-outline-level: 2; mso-para-margin-left: 2.57gd; mso-char-indent-count: 1.96">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">cvs checkout PPC</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">（项目名称）</span>
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 42pt; TEXT-INDENT: -21pt; mso-outline-level: 2; mso-list: l0 level1 lfo2; tab-stops: list 42.0pt">
				<span lang="EN-US" style="mso-fareast-font-family: 'Times New Roman'">
						<span style="mso-list: Ignore">2.<span style="FONT: 7pt 'Times New Roman'">         </span></span>
				</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">每日的</span>
				<span lang="EN-US">Daily Build</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">的流程</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 70.6pt; TEXT-INDENT: -1cm; mso-outline-level: 2; mso-list: l0 level2 lfo2; tab-stops: list 70.6pt">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US" style="mso-fareast-font-family: 'Times New Roman'">
								<span style="mso-list: Ignore">2.1<span style="FONT: 7pt 'Times New Roman'">          </span></span>
						</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">首先第一步在工作目录下面进入</span>
						<span lang="EN-US">PPC</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">，然后</span>
						<span lang="EN-US">Update</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">项目</span>
						<span lang="EN-US">
								<span style="mso-spacerun: yes">  </span>
						</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">命令：</span>
						<span lang="EN-US">cvs update<o:p></o:p></span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 42.25pt; mso-outline-level: 2">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US" style="COLOR: red">//</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="COLOR: red; FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">执行的顺序必须是首先</span>
						<span lang="EN-US" style="COLOR: red">update</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="COLOR: red; FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">，然后才能进行</span>
						<span lang="EN-US" style="COLOR: red">commit</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="COLOR: red; FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">等任务</span>
						<span lang="EN-US" style="COLOR: red">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 42.25pt; mso-outline-level: 2">
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">下面是</span>
						<span lang="EN-US">update</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">的信息</span>
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.2pt; TEXT-INDENT: 20.65pt; mso-outline-level: 2; mso-para-margin-left: 2.02gd; mso-char-indent-count: 1.96">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">? DIRTestLog/TestSimple<span style="mso-spacerun: yes">            </span><span style="mso-spacerun: yes"> </span><span style="COLOR: red">//</span></span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="COLOR: red; FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">？表示</span>
						<span lang="EN-US" style="COLOR: red">CVS</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="COLOR: red; FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">服务器上没有的文件</span>
						<span lang="EN-US" style="COLOR: red">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.2pt; TEXT-INDENT: 20.65pt; mso-outline-level: 2; mso-para-margin-left: 2.02gd; mso-char-indent-count: 1.96">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">? DIRTestLog/TestSimple.cpp<o:p></o:p></span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.2pt; TEXT-INDENT: 20.65pt; mso-outline-level: 2; mso-para-margin-left: 2.02gd; mso-char-indent-count: 1.96">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">? DIRTestLog/simple.conf<o:p></o:p></span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.2pt; TEXT-INDENT: 20.65pt; mso-outline-level: 2; mso-para-margin-left: 2.02gd; mso-char-indent-count: 1.96">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">cvs server: Updating .<span style="mso-spacerun: yes">                     </span><span style="COLOR: red">//Update</span></span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="COLOR: red; FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">开始</span>
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.2pt; TEXT-INDENT: 20.65pt; mso-outline-level: 2; mso-para-margin-left: 2.02gd; mso-char-indent-count: 1.96">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">cvs server: Updating DIRTestBtrees<span style="mso-spacerun: yes">         </span><span style="COLOR: red">//</span></span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="COLOR: red; FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">表示在</span>
						<span lang="EN-US" style="COLOR: red">Update</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="COLOR: red; FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">某个文件夹</span>
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.2pt; TEXT-INDENT: 20.65pt; mso-outline-level: 2; mso-para-margin-left: 2.02gd; mso-char-indent-count: 1.96">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">cvs server: Updating DIRTestGetIP<o:p></o:p></span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.2pt; TEXT-INDENT: 20.65pt; mso-outline-level: 2; mso-para-margin-left: 2.02gd; mso-char-indent-count: 1.96">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">RCS file: /app/PrePPC/DIRTestGetIP/makefile,v<o:p></o:p></span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.2pt; TEXT-INDENT: 20.65pt; mso-outline-level: 2; mso-para-margin-left: 2.02gd; mso-char-indent-count: 1.96">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">retrieving revision 1.4<o:p></o:p></span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.2pt; TEXT-INDENT: 20.65pt; mso-outline-level: 2; mso-para-margin-left: 2.02gd; mso-char-indent-count: 1.96">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">retrieving revision 1.5<o:p></o:p></span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.2pt; TEXT-INDENT: 20.65pt; mso-outline-level: 2; mso-para-margin-left: 2.02gd; mso-char-indent-count: 1.96">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">Merging differences between 1.4 and 1.5 into makefile<o:p></o:p></span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.2pt; TEXT-INDENT: 20.65pt; mso-outline-level: 2; mso-para-margin-left: 2.02gd; mso-char-indent-count: 1.96">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">rcsmerge: warning: conflicts during merge<o:p></o:p></span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.2pt; TEXT-INDENT: 20.65pt; mso-outline-level: 2; mso-para-margin-left: 2.02gd; mso-char-indent-count: 1.96">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">cvs server: conflicts found in DIRTestGetIP/makefile<o:p></o:p></span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.2pt; TEXT-INDENT: 20.65pt; mso-outline-level: 2; mso-para-margin-left: 2.02gd; mso-char-indent-count: 1.96">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">C DIRTestGetIP/makefile<span style="mso-spacerun: yes">       </span><span style="mso-spacerun: yes">             </span><span style="COLOR: red"><span style="mso-spacerun: yes"> </span>//C</span></span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="COLOR: red; FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">表示文件有冲突</span>
						<span lang="EN-US" style="COLOR: red">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.2pt; TEXT-INDENT: 20.65pt; mso-outline-level: 2; mso-para-margin-left: 2.02gd; mso-char-indent-count: 1.96">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">U DIRTestGetIP/test.cpp<span style="mso-spacerun: yes">                     </span><span style="COLOR: red"><span style="mso-spacerun: yes"> </span>//U</span></span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="COLOR: red; FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">表示文件被</span>
						<span lang="EN-US" style="COLOR: red">Update</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="COLOR: red; FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">下来</span>
						<span lang="EN-US" style="COLOR: red">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21.2pt; TEXT-INDENT: 20.65pt; mso-outline-level: 2; mso-para-margin-left: 2.02gd; mso-char-indent-count: 1.96">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">M DIRTestLog/core<span style="mso-spacerun: yes">             </span><span style="COLOR: red">//M</span></span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="COLOR: red; FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">表示文件被修改，本地版本比服务器新</span>
						<span lang="EN-US" style="COLOR: red">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 70.6pt; TEXT-INDENT: -1cm; mso-outline-level: 2; mso-list: l0 level2 lfo2; tab-stops: list 70.6pt">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US" style="mso-fareast-font-family: 'Times New Roman'">
								<span style="mso-list: Ignore">2.2<span style="FONT: 7pt 'Times New Roman'">          </span></span>
						</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">？开头的文件如何处理</span>
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 27pt; TEXT-INDENT: 15pt; mso-outline-level: 2">
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">表示你的本地有而服务器上没有，这时候你需要往</span>
				<span lang="EN-US">CVS</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">服务器添加文件</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 27pt; TEXT-INDENT: 15pt; mso-outline-level: 2">
				<span lang="EN-US">cvs add </span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">文件名</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 27pt; TEXT-INDENT: 15pt; mso-outline-level: 2">
				<span lang="EN-US">cvs commit </span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">－</span>
				<span lang="EN-US">m<span style="mso-spacerun: yes">  </span></span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">“注释”</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">文件名</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 27pt; TEXT-INDENT: 15pt; mso-outline-level: 2">
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">这样你就可以向</span>
				<span lang="EN-US">CVS</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">服务器增加文件了</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 70.6pt; TEXT-INDENT: -1cm; mso-outline-level: 2; mso-list: l0 level2 lfo2; tab-stops: list 70.6pt">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US" style="mso-fareast-font-family: 'Times New Roman'">
								<span style="mso-list: Ignore">2.3<span style="FONT: 7pt 'Times New Roman'">          </span></span>
						</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">M</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">开头的文件</span>
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 27pt; TEXT-INDENT: 15pt; mso-outline-level: 2">
				<span lang="EN-US">cvs commit </span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">－</span>
				<span lang="EN-US">m<span style="mso-spacerun: yes">  </span></span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">“注释”</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">文件名</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 70.6pt; TEXT-INDENT: -1cm; mso-outline-level: 2; mso-list: l0 level2 lfo2; tab-stops: list 70.6pt">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US" style="mso-fareast-font-family: 'Times New Roman'">
								<span style="mso-list: Ignore">2.4<span style="FONT: 7pt 'Times New Roman'">          </span></span>
						</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">C</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">表示文件有冲突，这时需要用</span>
						<span lang="EN-US">vi</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">查看文件，会记录冲突的地方</span>
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 42pt; mso-outline-level: 2">
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">如果文件有冲突，通常是有</span>
				<span lang="EN-US">2</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">个以上的人修改了该文件，可以查看历史找到相关人，然后和相关人进行确认修改的地方，然后再</span>
				<span lang="EN-US">commit</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">文件</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 70.6pt; TEXT-INDENT: -1cm; mso-outline-level: 2; mso-list: l0 level2 lfo2; tab-stops: list 70.6pt">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US" style="mso-fareast-font-family: 'Times New Roman'">
								<span style="mso-list: Ignore">2.5<span style="FONT: 7pt 'Times New Roman'">          </span></span>
						</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">如何删除文件</span>
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 42.55pt; mso-outline-level: 2">
				<span lang="EN-US">rm filename</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">（文件名）</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21pt; TEXT-INDENT: 21pt; mso-outline-level: 2">
				<span lang="EN-US">cvs delete filename</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">（文件名）</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 21pt; TEXT-INDENT: 21pt; mso-outline-level: 2">
				<span lang="EN-US">cvs commit –m “</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">注释</span>
				<span lang="EN-US">”<span style="mso-spacerun: yes">  </span>filename</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">（文件名）</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 70.6pt; TEXT-INDENT: -1cm; mso-outline-level: 2; mso-list: l0 level2 lfo2; tab-stops: list 70.6pt">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US" style="mso-fareast-font-family: 'Times New Roman'">
								<span style="mso-list: Ignore">2.6<span style="FONT: 7pt 'Times New Roman'">          </span></span>
						</span>
				</b>
				<b style="mso-bidi-font-weight: normal">
						<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">添加文件夹和删除文件夹</span>
						<span lang="EN-US">
								<o:p>
								</o:p>
						</span>
				</b>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 42pt; mso-outline-level: 2">
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">与添加文件与删除文件类似，要注意的是文件夹被添加后，需要里面有文件才能真正被增加到</span>
				<span lang="EN-US">CVS</span>
				<span style="FONT-FAMILY: 宋体; mso-ascii-font-family: 'Times New Roman'; mso-hansi-font-family: 'Times New Roman'">服务器上，删除文件夹需要先删除下面的文件</span>
		</p>
		<p class="MsoNormal" style="MARGIN: 0cm 0cm 0pt 27pt; mso-outline-level: 2">
				<b style="mso-bidi-font-weight: normal">
						<span lang="EN-US">
								<o:p> </o:p>
						</span>
				</b>
		</p>
<img src ="http://www.blogjava.net/fanscial/aggbug/39448.html" width = "1" height = "1" /><br><br><div align=right><a style="text-decoration:none;" href="http://www.blogjava.net/fanscial/" target="_blank">fanta</a> 2006-04-05 19:03 <a href="http://www.blogjava.net/fanscial/archive/2006/04/05/39448.html#Feedback" target="_blank" style="text-decoration:none;">发表评论</a></div>]]></description></item><item><title>在Spring环境下结合TestNG使用DbUnit</title><link>http://www.blogjava.net/fanscial/archive/2005/12/31/26175.html</link><dc:creator>fanta</dc:creator><author>fanta</author><pubDate>Sat, 31 Dec 2005 04:27:00 GMT</pubDate><guid>http://www.blogjava.net/fanscial/archive/2005/12/31/26175.html</guid><wfw:comment>http://www.blogjava.net/fanscial/comments/26175.html</wfw:comment><comments>http://www.blogjava.net/fanscial/archive/2005/12/31/26175.html#Feedback</comments><slash:comments>0</slash:comments><wfw:commentRss>http://www.blogjava.net/fanscial/comments/commentRss/26175.html</wfw:commentRss><trackback:ping>http://www.blogjava.net/fanscial/services/trackbacks/26175.html</trackback:ping><description><![CDATA[&nbsp;&nbsp;&nbsp;&nbsp; 摘要: &nbsp;&nbsp;<a href='http://www.blogjava.net/fanscial/archive/2005/12/31/26175.html'>阅读全文</a><img src ="http://www.blogjava.net/fanscial/aggbug/26175.html" width = "1" height = "1" /><br><br><div align=right><a style="text-decoration:none;" href="http://www.blogjava.net/fanscial/" target="_blank">fanta</a> 2005-12-31 12:27 <a href="http://www.blogjava.net/fanscial/archive/2005/12/31/26175.html#Feedback" target="_blank" style="text-decoration:none;">发表评论</a></div>]]></description></item><item><title>SIP SAP及SDP协议组合应用的研究(转)</title><link>http://www.blogjava.net/fanscial/archive/2005/12/25/25364.html</link><dc:creator>fanta</dc:creator><author>fanta</author><pubDate>Sun, 25 Dec 2005 05:59:00 GMT</pubDate><guid>http://www.blogjava.net/fanscial/archive/2005/12/25/25364.html</guid><wfw:comment>http://www.blogjava.net/fanscial/comments/25364.html</wfw:comment><comments>http://www.blogjava.net/fanscial/archive/2005/12/25/25364.html#Feedback</comments><slash:comments>1</slash:comments><wfw:commentRss>http://www.blogjava.net/fanscial/comments/commentRss/25364.html</wfw:commentRss><trackback:ping>http://www.blogjava.net/fanscial/services/trackbacks/25364.html</trackback:ping><description><![CDATA[&nbsp;&nbsp;&nbsp;&nbsp; 摘要: &nbsp;&nbsp;<a href='http://www.blogjava.net/fanscial/archive/2005/12/25/25364.html'>阅读全文</a><img src ="http://www.blogjava.net/fanscial/aggbug/25364.html" width = "1" height = "1" /><br><br><div align=right><a style="text-decoration:none;" href="http://www.blogjava.net/fanscial/" target="_blank">fanta</a> 2005-12-25 13:59 <a href="http://www.blogjava.net/fanscial/archive/2005/12/25/25364.html#Feedback" target="_blank" style="text-decoration:none;">发表评论</a></div>]]></description></item><item><title>单元测试，TestNG，Junit</title><link>http://www.blogjava.net/fanscial/archive/2005/12/19/24587.html</link><dc:creator>fanta</dc:creator><author>fanta</author><pubDate>Mon, 19 Dec 2005 03:20:00 GMT</pubDate><guid>http://www.blogjava.net/fanscial/archive/2005/12/19/24587.html</guid><wfw:comment>http://www.blogjava.net/fanscial/comments/24587.html</wfw:comment><comments>http://www.blogjava.net/fanscial/archive/2005/12/19/24587.html#Feedback</comments><slash:comments>0</slash:comments><wfw:commentRss>http://www.blogjava.net/fanscial/comments/commentRss/24587.html</wfw:commentRss><trackback:ping>http://www.blogjava.net/fanscial/services/trackbacks/24587.html</trackback:ping><description><![CDATA[&nbsp;&nbsp;&nbsp;&nbsp; 摘要: 从Cedric的一篇blog说起&nbsp;&nbsp;<a href='http://www.blogjava.net/fanscial/archive/2005/12/19/24587.html'>阅读全文</a><img src ="http://www.blogjava.net/fanscial/aggbug/24587.html" width = "1" height = "1" /><br><br><div align=right><a style="text-decoration:none;" href="http://www.blogjava.net/fanscial/" target="_blank">fanta</a> 2005-12-19 11:20 <a href="http://www.blogjava.net/fanscial/archive/2005/12/19/24587.html#Feedback" target="_blank" style="text-decoration:none;">发表评论</a></div>]]></description></item><item><title>TestNG 与 Junit的比较（四）</title><link>http://www.blogjava.net/fanscial/archive/2005/12/16/24195.html</link><dc:creator>fanta</dc:creator><author>fanta</author><pubDate>Fri, 16 Dec 2005 05:39:00 GMT</pubDate><guid>http://www.blogjava.net/fanscial/archive/2005/12/16/24195.html</guid><wfw:comment>http://www.blogjava.net/fanscial/comments/24195.html</wfw:comment><comments>http://www.blogjava.net/fanscial/archive/2005/12/16/24195.html#Feedback</comments><slash:comments>0</slash:comments><wfw:commentRss>http://www.blogjava.net/fanscial/comments/commentRss/24195.html</wfw:commentRss><trackback:ping>http://www.blogjava.net/fanscial/services/trackbacks/24195.html</trackback:ping><description><![CDATA[&nbsp;&nbsp;&nbsp;&nbsp; 摘要: &nbsp;&nbsp;<a href='http://www.blogjava.net/fanscial/archive/2005/12/16/24195.html'>阅读全文</a><img src ="http://www.blogjava.net/fanscial/aggbug/24195.html" width = "1" height = "1" /><br><br><div align=right><a style="text-decoration:none;" href="http://www.blogjava.net/fanscial/" target="_blank">fanta</a> 2005-12-16 13:39 <a href="http://www.blogjava.net/fanscial/archive/2005/12/16/24195.html#Feedback" target="_blank" style="text-decoration:none;">发表评论</a></div>]]></description></item><item><title>TestNG 与 Junit的比较（三）</title><link>http://www.blogjava.net/fanscial/archive/2005/12/15/23990.html</link><dc:creator>fanta</dc:creator><author>fanta</author><pubDate>Thu, 15 Dec 2005 02:48:00 GMT</pubDate><guid>http://www.blogjava.net/fanscial/archive/2005/12/15/23990.html</guid><wfw:comment>http://www.blogjava.net/fanscial/comments/23990.html</wfw:comment><comments>http://www.blogjava.net/fanscial/archive/2005/12/15/23990.html#Feedback</comments><slash:comments>0</slash:comments><wfw:commentRss>http://www.blogjava.net/fanscial/comments/commentRss/23990.html</wfw:commentRss><trackback:ping>http://www.blogjava.net/fanscial/services/trackbacks/23990.html</trackback:ping><description><![CDATA[&nbsp;&nbsp;&nbsp;&nbsp; 摘要: &nbsp;&nbsp;<a href='http://www.blogjava.net/fanscial/archive/2005/12/15/23990.html'>阅读全文</a><img src ="http://www.blogjava.net/fanscial/aggbug/23990.html" width = "1" height = "1" /><br><br><div align=right><a style="text-decoration:none;" href="http://www.blogjava.net/fanscial/" target="_blank">fanta</a> 2005-12-15 10:48 <a href="http://www.blogjava.net/fanscial/archive/2005/12/15/23990.html#Feedback" target="_blank" style="text-decoration:none;">发表评论</a></div>]]></description></item><item><title>TestNG 与 Junit的比较（二）</title><link>http://www.blogjava.net/fanscial/archive/2005/12/14/23864.html</link><dc:creator>fanta</dc:creator><author>fanta</author><pubDate>Wed, 14 Dec 2005 06:25:00 GMT</pubDate><guid>http://www.blogjava.net/fanscial/archive/2005/12/14/23864.html</guid><wfw:comment>http://www.blogjava.net/fanscial/comments/23864.html</wfw:comment><comments>http://www.blogjava.net/fanscial/archive/2005/12/14/23864.html#Feedback</comments><slash:comments>1</slash:comments><wfw:commentRss>http://www.blogjava.net/fanscial/comments/commentRss/23864.html</wfw:commentRss><trackback:ping>http://www.blogjava.net/fanscial/services/trackbacks/23864.html</trackback:ping><description><![CDATA[&nbsp;&nbsp;&nbsp;&nbsp; 摘要: &nbsp;&nbsp;<a href='http://www.blogjava.net/fanscial/archive/2005/12/14/23864.html'>阅读全文</a><img src ="http://www.blogjava.net/fanscial/aggbug/23864.html" width = "1" height = "1" /><br><br><div align=right><a style="text-decoration:none;" href="http://www.blogjava.net/fanscial/" target="_blank">fanta</a> 2005-12-14 14:25 <a href="http://www.blogjava.net/fanscial/archive/2005/12/14/23864.html#Feedback" target="_blank" style="text-decoration:none;">发表评论</a></div>]]></description></item><item><title>TestNG 与 Junit的比较（一）</title><link>http://www.blogjava.net/fanscial/archive/2005/12/14/23780.html</link><dc:creator>fanta</dc:creator><author>fanta</author><pubDate>Wed, 14 Dec 2005 02:33:00 GMT</pubDate><guid>http://www.blogjava.net/fanscial/archive/2005/12/14/23780.html</guid><wfw:comment>http://www.blogjava.net/fanscial/comments/23780.html</wfw:comment><comments>http://www.blogjava.net/fanscial/archive/2005/12/14/23780.html#Feedback</comments><slash:comments>0</slash:comments><wfw:commentRss>http://www.blogjava.net/fanscial/comments/commentRss/23780.html</wfw:commentRss><trackback:ping>http://www.blogjava.net/fanscial/services/trackbacks/23780.html</trackback:ping><description><![CDATA[&nbsp;&nbsp;&nbsp;&nbsp; 摘要: &nbsp;&nbsp;<a href='http://www.blogjava.net/fanscial/archive/2005/12/14/23780.html'>阅读全文</a><img src ="http://www.blogjava.net/fanscial/aggbug/23780.html" width = "1" height = "1" /><br><br><div align=right><a style="text-decoration:none;" href="http://www.blogjava.net/fanscial/" target="_blank">fanta</a> 2005-12-14 10:33 <a href="http://www.blogjava.net/fanscial/archive/2005/12/14/23780.html#Feedback" target="_blank" style="text-decoration:none;">发表评论</a></div>]]></description></item><item><title>Hibernate（以前写的给公司的培训资料）</title><link>http://www.blogjava.net/fanscial/archive/2005/12/12/23509.html</link><dc:creator>fanta</dc:creator><author>fanta</author><pubDate>Mon, 12 Dec 2005 08:39:00 GMT</pubDate><guid>http://www.blogjava.net/fanscial/archive/2005/12/12/23509.html</guid><wfw:comment>http://www.blogjava.net/fanscial/comments/23509.html</wfw:comment><comments>http://www.blogjava.net/fanscial/archive/2005/12/12/23509.html#Feedback</comments><slash:comments>0</slash:comments><wfw:commentRss>http://www.blogjava.net/fanscial/comments/commentRss/23509.html</wfw:commentRss><trackback:ping>http://www.blogjava.net/fanscial/services/trackbacks/23509.html</trackback:ping><description><![CDATA[&nbsp;&nbsp;&nbsp;&nbsp; 摘要: &nbsp;&nbsp;<a href='http://www.blogjava.net/fanscial/archive/2005/12/12/23509.html'>阅读全文</a><img src ="http://www.blogjava.net/fanscial/aggbug/23509.html" width = "1" height = "1" /><br><br><div align=right><a style="text-decoration:none;" href="http://www.blogjava.net/fanscial/" target="_blank">fanta</a> 2005-12-12 16:39 <a href="http://www.blogjava.net/fanscial/archive/2005/12/12/23509.html#Feedback" target="_blank" style="text-decoration:none;">发表评论</a></div>]]></description></item></channel></rss>