docs-common/common cvs-zh_CN.xml,NONE,1.1
Yuan Yijun (bbbush)
fedora-docs-commits at redhat.com
Fri Dec 9 13:53:33 UTC 2005
- Previous message: docs-common/images watermark-zh_CN.png, NONE, 1.1 watermark-zh_CN.svg, NONE, 1.1
- Next message: documentation-guide acknowledgments-zh_CN.xml, NONE, 1.1 docs-converting-zh_CN.xml, NONE, 1.1 docs-emacs-nxml-zh_CN.xml, NONE, 1.1 docs-emacs-zh_CN.xml, NONE, 1.1 docs-getting-files-zh_CN.xml, NONE, 1.1 docs-intro-zh_CN.xml, NONE, 1.1 docs-rh-guidelines-zh_CN.xml, NONE, 1.1 docs-style-zh_CN.xml, NONE, 1.1 docs-tutorial-zh_CN.xml, NONE, 1.1 docs-vim-zh_CN.xml, NONE, 1.1 docs-xml-tags-zh_CN.xml, NONE, 1.1 documentation-guide-zh_CN.xml, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: bbbush
Update of /cvs/docs/docs-common/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20695/common
Added Files:
cvs-zh_CN.xml
Log Message:
1. the <prompt>$</prompt> tag cause a lot of trouble in po -> xml, it
produce incorrect newlines.
2. the watermark.png is generated using inkscape, the characters are
not very clear but better than gimp. the picture is not 1024x768
but smaller.
--- NEW FILE cvs-zh_CN.xml ---
<?xml version="1.0" encoding="utf-8"?>
<!-- $Id: --><!--
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
<!ENTITY BOILERPLATE "This header makes editing XML easier" >
<!ENTITY FC "Fedora Core" >
<!ENTITY RH "Red Hat" >
]>
--><chapter id="ch-cvs">
<title>CVS</title>
<para>并åçæ¬æ§å¶ç³»ç» (<application>CVS</application>) æä¾äºä¸ä¸ªæ¡æ¶ï¼ä½¿å¤ä¸ªç¨æ·å¯ä»¥ä¿®æ¹ç¸åçä¸ç»æ件ãå¯ä»¥æ³è±¡ï¼å¦æç¨æ·ä»¬å¨åä¸ä¸ªç®å½ä¸ä¿®æ¹æ件ï¼å°äº§çæ大çæ··ä¹±ãä½¿ç¨ <application>CVS</application>ï¼ç¨æ·ä»¬å°±å¯ä»¥å®å
¨å°ä¿®æ¹ç¸åçä¸ç»æ件äºã<application>CVS</application> ä¿çæ件ç主å¤ä»½ï¼å¹¶ä¸å¨ä¸ä¸ªä¸å¤®ä»åºä¸è®°å½è°å¨ä½æ¶ä¿®æ¹äºåªäºå
容ãå¦æåºç°äºå²çªï¼<application>CVS</application> å¯ä»¥åè¯ç¨æ·ã<application>CVS</application> é常ç¨å¨ç¨åºåé´å
±äº«ä»£ç ï¼ä½æ¯å¨ææ¡£æ°åä¸ä¹å¾æ¹ä¾¿ã</para>
<indexterm>
<primary>cvs</primary>
</indexterm>
<section id="sn-cvs-overview">
<title>CVS å¦ä½è¿ä½</title>
<indexterm>
<primary>cvs</primary>
<secondary>CVS å¦ä½è¿ä½</secondary>
</indexterm>
<indexterm>
<primary>cvs</primary>
<secondary>æ¦è¿°</secondary>
</indexterm>
<para>å¤æ°æ
åµä¸ï¼ææ项ç®çæ件éå¨ CVS æå¡å¨ä¸ä¿å为 <firstterm>module</firstterm>(模å)ã</para>
<para>å¨ä½¿ç¨ <application>CVS</application> æ¶ï¼å
å°æ¨¡å <firstterm>checkout</firstterm>(æ£åº)ä¸ä»½å°æ¬å°æ件系ç»ä¸ãä¿®æ¹ä¸ä¸ªæå¤ä¸ªæ件åï¼å°å®ä»¬ <firstterm>commit</firstterm>(æ交)åä¸å¤® <application>CVS</application> æå¡å¨ã</para>
<para>ä½¿ç¨ <application>CVS</application> æ¶ï¼ä¸å¿
è·å许å¯æå éå°±å¯ä»¥ä¿®æ¹æ件ã<application>CVS</application> çååä¸ï¼<wordasword>concurrent</wordasword>(并å)è¿ä¸ªè¯æ¥æºäºå®å
许ä¸åç人ç¼è¾åä¸æ件çä¸åé¨åè¿ä¸è½åãåªè¦è¿äºä¿®æ¹ä¸éå ï¼<application>CVS</application> å°±å¯ä»¥æ£ç¡®å°è®°å½ä¿®æ¹ãå¦æåºç°éå¤çä¿®æ¹ï¼ä¼è¢«æ è¯å¨æ件ä¸ï¼ä½è
å¿
é¡»èªè¡è§£å³å®ä»¬ã</para>
<para>å¨æ交修æ¹æ¶ï¼åªææå¡å¨ç¥éçæ件æä¼å¾å°æ交ãä¹å°±æ¯è¯´ï¼å¦ææ¨å¨æ¬å°å·¥ä½ç®å½ä¸å建äºä¸ä¸ªæ件ï¼æ°æ件ä¸ä¼èªå¨ä¼ è¾å°æå¡å¨ãæ¨å¿
é¡» <firstterm>add</firstterm>(æ·»å )æ件å°ä»åºä¸ï¼ç¶ååæ交å®ãå¦ææ¨è¦å é¤ä¸ä¸ªæ件ï¼å¿
须说æè¦ä» CVS æå¡å¨çä»åºä¸å é¤æ件ï¼ç¶åå°æ件çå é¤æ交ã</para>
<para>æ§è¡è¿äºå¨ä½çå½ä»¤è¯·åé
<xref linkend="sn-cvs-cvscommands"/>ã</para>
<para>ä»ä¸æ¬¡æ¨ä» CVS è·åæ件ï¼å°æç®æ交æ个修æ¹ï¼è¿æ®µæ¶é´éå¦ææ人修æ¹è¿è¿ä¸ªæ件ï¼<application>CVS</application> å°å°è¯å°ä¿®æ¹åå¹¶å° <application>CVS</application> æå¡å¨ä¸çå¤æ¬ä¸ãå¦ææ¨ä¸ä»äººä¿®æ¹çæ¯æ件çä¸åé¨åï¼æ交ä¹è®¸ä¸ä¼æä»»ä½ <firstterm>conflict</firstterm>(å²çª)é®é¢ãå¦æä»äººä¿®æ¹çæ£æ¯æ¨æç®æ交çé¨åï¼æ¨å°çå°åçå²çªçæ示ãè¿æ¶ï¼æ¨å¿
é¡» <firstterm>update</firstterm>(æ´æ°)æ件ãå¨ä¿®æ¹æ件åæ»æ¯æ´æ°å®æ¯ä¸ªå¥½ä¹ æ¯ã请åè <xref linkend="sn-cvs-cvscommands-conflicts"/> ä¸è§£å³å²çªçæ¥éª¤ã</para>
</section>
<section id="sn-cvs-preparation">
<title>为 CVS ä½åå¤</title>
<indexterm>
<primary>cvs</primary>
<secondary>为 cvs ä½åå¤</secondary>
</indexterm>
<para>å¨ä½¿ç¨ <application>CVS</application> ä¹åï¼æ¨å¿
é¡»å¨ <application>CVS</application> æå¡å¨ä¸å»ºç«å¸æ·ãå¾å°å¸æ·åï¼å°±ä¸å¿
åæ§è¡è¿äºæä½äºã</para>
<section id="sn-cvs-rpm-check">
<title>CVS æ¯å¦å·²å®è£
å¨ç³»ç»ä¸</title>
<indexterm>
<primary>cvs</primary>
<secondary>RPM æ¹å¼å®è£
</secondary>
</indexterm>
<para>æ¨å¿
é¡»å®è£
<application>CVS</application> ç <abbrev>RPM</abbrev>ãå¯ä»¥è¿æ ·æ£æ¥æ¯å¦å·²ç»å®è£
ï¼</para>
<screen><prompt>$</prompt> <command>rpm -q cvs</command> </screen>
<para>å¦ææ¨çå°äºç±»ä¼¼ <computeroutput>cvs-1.11.19-1</computeroutput> çè¾åºï¼é£ä¹å·²ç»å®è£
äºãå¦æçå°ç±»ä¼¼ <computeroutput>package cvs is not installed</computeroutput> çè¾åºï¼è¿æå³çæ¨éè¦å®è£
å®ãå¦ææ¨ä¸ç¥éæä¹å®è£
ï¼è¯·å管çåæ±å©ã</para>
</section>
<section id="sn-cvs-generate-keys">
<title>çæ SSH å¯é¥</title>
<indexterm>
<primary>OpenSSH</primary>
<secondary>认è¯å¯é¥</secondary>
</indexterm>
<para>
<application>CVS</application> æå¡å¨ä½¿ç¨ <application>SSH</application> 2 åè®®å¯é¥æ¥è®¤è¯ç¨æ·ãå æ¤ï¼æ¨éè¦çæä¸å¯¹å¯é¥ï¼æè½å¾å° <application>CVS</application> å¸å·ãå¦ææ¨å·²ç»æäº <application>SSH</application> <abbrev>DSA</abbrev> å¯é¥ï¼å°±å¯ä»¥è·³è¿è¿ä¸æ¥ã</para>
<tip>
<title>æå·§</title>
<para>å¦æç³»ç»ä¸æ <filename>~/.ssh/id_dsa.pub</filename> è¿ä¸ªæ件ï¼é£ä¹æ¨å·²ç»æäº <abbrev>DSA</abbrev> å¯é¥ã</para>
<para>å¦æç°æç <abbrev>DSA</abbrev> å¯é¥ä¸éè¦ <wordasword>passphrase</wordasword>(å£ä»¤)ï¼æ¨æ好尽快çæä¸ä¸ªéè¦å£ä»¤çå¯é¥ã</para>
</tip>
<para>æç
§ä¸åæ¥éª¤æ¥çæ <application>SSH</application> 2 å议使ç¨ç <abbrev>DSA</abbrev> å¯é¥ãè¿æ¯ <computeroutput>cvs.fedora.redhat.com</computeroutput> <application>CVS</application> å¸å·å¿
éçã</para>
<orderedlist>
<indexterm>
<primary>OpenSSH</primary>
<secondary>
<command>ssh-keygen</command>
</secondary>
</indexterm>
<indexterm>
<primary>
<command>ssh-keygen</command>
</primary>
</indexterm>
<listitem>
<para>è¦çæ SSH2 åè®®ç <acronym>DSA</acronym> å¯é¥ï¼å¨ shell æ示符ä¸ï¼è¾å
¥å½ä»¤ï¼</para>
<screen><prompt>$</prompt> <command>ssh-keygen -t dsa</command> </screen>
<para>æ¥åé»è®¤çæ件ä½ç½® <filename>~/.ssh/id_dsa</filename>ãæ¨åºå½ä½¿ç¨å£ä»¤æ¥å 强å¯é¥çå®å
¨ãè¾å
¥ä¸å¸å·å¯ç ä¸åçå£ä»¤ï¼ç¶å确认å®ï¼åªè¦éæ°è¾å
¥ä¸æ¬¡ã</para>
</listitem>
<listitem>
<para>è¾å
¥ä¸åå½ä»¤ï¼å°æ°çå¯é¥å¤å¶å°æ£ç¡®çæ件ä¸ï¼</para>
<screen><prompt>$</prompt> <command>cat ~/.ssh/id_dsa.pub>>~/.ssh/authorized_keys</command> </screen>
<note>
<para>å¨æä¸ <guibutton>ENTER</guibutton>(å车)é®ä¹åä»ç»æ£æ¥å½ä»¤ãå¦æ <filename>~/.ssh/authorized_keys</filename> å·²ç»åå¨ï¼ <filename>~/.ssh/id_dsa.pub</filename> çå
容å°è¢«è¿½å å° <filename>~/.ssh/authorized_keys</filename> æ件çç»å°¾ã</para>
</note>
</listitem>
<listitem>
<para>è¾å
¥ä¸åå½ä»¤ï¼ä¿®æ¹ <filename>~/.ssh</filename> ç®å½åå¯é¥æ件çæéï¼</para>
<screen><prompt>$</prompt> <command>chmod 755 ~/.ssh</command>
<prompt>$</prompt> <command>chmod 644 ~/.ssh/authorized_keys</command> </screen>
</listitem>
</orderedlist>
<tip>
<title>æå·§</title>
<para>æ¨å¯ä»¥è®©ç³»ç»è®°ä½å£ä»¤ï¼è¿æ ·è®¿é® <application>CVS</application> æå¡å¨æ¶å°±ä¸å¿
æ¯æ¬¡è¾å
¥äºã请åè <application>ssh-add</application> ç¨åºçææ¡£ã</para>
</tip>
</section>
</section>
<section id="sn-cvs-config">
<title>é
ç½® CVS 访é®</title>
<indexterm>
<primary>cvs</primary>
<secondary>é
ç½® cvs 访é®</secondary>
</indexterm>
<indexterm>
<primary>cvs</primary>
<secondary>CVSROOT</secondary>
</indexterm>
<indexterm>
<primary>cvs</primary>
<secondary>CVS_RSH</secondary>
</indexterm>
<indexterm>
<primary>CVSROOT</primary>
</indexterm>
<indexterm>
<primary>CVS_RSH</primary>
</indexterm>
<indexterm>
<primary>cvs</primary>
<secondary>
<filename>.cvsrc</filename>
</secondary>
</indexterm>
<indexterm>
<primary>
<filename>.cvsrc</filename>
</primary>
</indexterm>
<section id="sn-cvs-config-cvsrc">
<title>é¿å
éå¤è¾å
¥</title>
<indexterm>
<primary>cvs</primary>
<secondary>é¿å
éå¤è¾å
¥</secondary>
</indexterm>
<para>è®¸å¤ <application>CVS</application> å½ä»¤éè¦ç¹å®çå½ä»¤è¡é项æè½æé
使ç¨ãä¸å
¶æ¯æ¬¡ç¨å°æ¶è¾å
¥è¿äºé项ï¼æ¨å¯ä»¥å°å®ä»¬ä¿åå¨æ件éï¼è®© <application>CVS</application> æ¯æ¬¡æ§è¡å读åå®ã</para>
<para>å¨ä¸ªäººç®å½ä¸å建ä¸ä¸ªå«å <filename>~/.cvsrc</filename> çæ件ãå®åºå½å
å«ä¸åå½ä»¤ï¼æ¯ä¸ªå½ä»¤å ä¸è¡ï¼ <screen><computeroutput>cvs -z3
diff -uNp
rdiff -uNp
update -dP</computeroutput></screen></para>
</section>
<section id="sn-cvs-config-anon">
<title>é
ç½®åªè¯»ç CVS 访é®</title>
<indexterm>
<primary>cvs</primary>
<secondary>é
ç½®åªè¯»è®¿é®</secondary>
</indexterm>
<indexterm>
<primary>cvs</primary>
<secondary>å¿å访é®</secondary>
</indexterm>
<para>å¦ææ¨çç®çæ¯ä¸è½½åç¯ &FC; æ档并å¨èªå·±çç³»ç»ä¸ç¼è¯ï¼é£ä¹åªè¯»è®¿é®å°±å¤äºãç
§åæ¬èçæ令ï¼ç¶åç´æ¥è·³è½¬å° <xref linkend="sn-cvs-cvscommands-co"/>ã</para>
<para>åæ¢å°å°åæ¾ <application>CVS</application> ä¸æ件çç®å½ï¼ç¶åæ§è¡ä¸é¢çå½ä»¤ï¼</para>
<screen><prompt>$</prompt> <command>export CVSROOT=:pserver:cvs.fedora.redhat.com:/cvs/docs</command>
<prompt>$</prompt> <command>cvs login</command>
<prompt>$</prompt> <command>cvs checkout docs-common</command> <replaceable>module-name</replaceable>
<prompt>$</prompt> <command>cvs checkout</command> <replaceable>module-name</replaceable>
<prompt>$</prompt> <command>cd</command> <replaceable>module-name</replaceable></screen>
<para>æ£åºæ¨¡åä¹åï¼<envar>CVSROOT</envar> ç¯å¢åéç设置就ä¸åæç¨ï¼å 为æ£ç¡®çå¼å·²ç»ä¿åå¨äºæ¬å°å·¥ä½ç®å½çæ¯ä¸ªåç®å½ä¸ï¼æ件 <filename>CVS/Root</filename> éé¢ãåªè¦å½åå·¥ä½ç®å½å
å« <filename>CVS/</filename> ç®å½ï¼<application>CVS</application> ç¨åºå°±å¯ä»¥èªå¨æ¾å° &FC; ä»åºã</para>
</section>
<section id="sn-cvs-config-author">
<title>é
ç½®å¯è¯»åç CVS 访é®</title>
<indexterm>
<primary>cvs</primary>
<secondary>é
置读å访é®</secondary>
</indexterm>
<indexterm>
<primary>cvs</primary>
<secondary>ä½ä¸ºä½è
ç设置</secondary>
</indexterm>
<para>è¦åä½æ°ææ¡£ï¼ææ¯ä¿®æ¹å·²æçï¼å¿
é¡»å¾å° &FC; Docs <application>CVS</application> ä»åºçå®æ´è¯»åæéãå
³äºè¿ä¸ªè¿ç¨ï¼è¯·åè <ulink url="http://fedoraproject.org/wiki/DocsProject/NewWriters"><filename>http://fedoraproject.org/wiki/DocsProject/NewWriters</filename></ulink> 页é¢ãä¸é¢æ¯å¤§è´çæ¥éª¤ï¼</para>
<itemizedlist>
<listitem>
<para>订é
<ulink url="https://listman.redhat.com/mailman/listinfo/fedora-docs-list"><filename>fedora-docs-list</filename></ulink> é®ä»¶å表ï¼è¿æ¯é¡¹ç®ä¸»è¦ç讨论åºã</para>
</listitem>
<listitem>
<para>å建ä¸ä¸ª GNU Privacy Guard (<abbrev>GPG</abbrev>) å¯é¥æ¥åå
¶ä»äººæ è¯èªå·±ç身份ã</para>
</listitem>
<listitem>
<para>注å <ulink url="http://bugzilla.redhat.com/"><filename>Bugzilla</filename></ulink> å¸å·ï¼å¦æ以å没æ注åè¿çè¯ã<filename>Bugzilla</filename> æ¯è·è¸ªé®é¢ãä¿®æ¹å项ç®æ´æ°çéå¾ã</para>
</listitem>
<listitem>
<para>åé®ä»¶å表ååº <ulink url="http://fedoraproject.org/wiki/DocsProject/SelfIntroduction">self introduction</ulink>(èªæä»ç»)ã</para>
</listitem>
</itemizedlist>
<para>å½æ¨ç <ulink url="http://fedoraproject.org/wiki/DocsProject/SelfIntroduction">èªæä»ç»</ulink> 被æ¥ååï¼æ¨å°è·å¾ <application>CVS</application> 访é®æã</para>
<para>æ¯ä½ä½è
ï¼ä¹å
æ¬æ¨ï¼å¨èªæä»ç»è¢«æ¥çº³ä¹åï¼å°±ä½¿ç¨ç¬ä¸æ äºç <envar>$CVSROOT</envar> æ¥è®¿é® <application>CVS</application> ä»åºï¼</para>
<screen><prompt>$</prompt> <command>export CVSROOT=:ext:</command> <replaceable>yourname</replaceable> <command>@cvs.fedora.redhat.com:/cvs/docs</command>
<prompt>$</prompt> <command>export CVS_RSH=/usr/bin/ssh</command> </screen>
<para>è®¾ç½®äº <envar>$CVSROOT</envar> å <envar>$CVS_RSH</envar> ç¯å¢åéåï¼å°±å¯ä»¥è®¿é®ä»åºäºï¼</para>
<screen><prompt>$</prompt> <command>cvs co -c</command> </screen>
<para>æ¨å°è¢«æ示è¾å
¥ <application>SSH</application> å¯é¥çå£ä»¤ãæä¸ <guibutton>ENTER</guibutton> å¯ä»¥çå°ä»åºä¸å·²æ模åçå表ã</para>
</section>
</section>
<section id="sn-cvs-cvscommands">
<title>åºæ¬ç CVS å½ä»¤</title>
<indexterm>
<primary>cvs</primary>
<secondary>å½ä»¤</secondary>
</indexterm>
<para>é
置好系ç»ç CVS 访é®ä¹åï¼æ£åºè¦å¤çç模åã</para>
<tip>
<title>æå·§</title>
<para>å
³äºæ¯å¦éè¦è®¾ç½® <envar>$CVSROOT</envar> ç¯å¢åéï¼æå½ä»¤è¡é项 <option>-m </option><replaceable>repository</replaceable>ï¼åºå½çå½åå·¥ä½ç®å½æ¯å¦æä¸ä¸ª <filename>CVS/</filename> åç®å½ã</para>
<para>å¦ææ <filename>CVS/</filename> åç®å½ï¼<application>CVS</application> 忽ç¥ä»»ä½ <envar>$CVSROOT</envar> æ <option>-m</option> å½ä»¤è¡é项设置ã</para>
</tip>
<section id="sn-cvs-cvscommands-co">
<title>æ£åºæ¨¡å</title>
<indexterm>
<primary>cvs</primary>
<secondary>æ£åºæ¨¡å</secondary>
</indexterm>
<para>æ¨åªéæ£åºæ¨¡åä¸æ¬¡ãå½ä¸ä¸ªæ¨¡åæ£åºå°æ¬å°ä¹åï¼å®å°±ä¸ç´å¨é£å¿äºã</para>
<para>è¦æ£åºä¸ä¸ªæ¨¡åï¼æ§è¡ä¸é¢çå½ä»¤ï¼</para>
<screen><prompt>$</prompt> <command>cvs co</command> <replaceable><module-name></replaceable></screen>
<para>ä¾å¦ï¼è¦æ£åº <computeroutput>example-tutorial</computeroutput> 模åï¼å
è¿å
¥å·¥ä½ç®å½ï¼ç¶åæ§è¡ä¸é¢çå½ä»¤ï¼</para>
<screen><prompt>$</prompt> <command>cvs co example-tutorial</command> </screen>
<para>å½åç®å½ä¸å°æ°å»ºä¸ä¸ªååæ¯ <filename>example-tutorial/</filename> çåç®å½ã</para>
<para>å¦ææ£åºæ¨¡åæ¶æ²¡ææå®åæ¯å称ï¼é»è®¤å°±æ¯ <application>CVS</application> ä¸æ¨¡åç <firstterm>HEAD</firstterm> åæ¯ã</para>
<section id="sn-cvs-cvscommands-co-branch">
<title>æ£åºæ¨¡åçåæ¯</title>
<indexterm>
<primary>cvs</primary>
<secondary>æ£åºæ¨¡å</secondary>
<tertiary>æ£åºåæ¯</tertiary>
</indexterm>
<para>å¯ä»¥å° <application>CVS</application> åæ¯è§ä¸ºä¸ç¯æåçæ个çæ¬ï¼ææ¯ä¸ä¸ªæ件çä¸åçæ¬ã</para>
<para>è¦æ£åºæ¨¡åçåæ¯ï¼è¿è¡ä¸é¢çå½ä»¤ï¼</para>
<screen><prompt>$</prompt> <command>cvs co</command> <option>-d</option> <replaceable><directory></replaceable> <option>-r</option> <replaceable><branchname></replaceable> <replaceable><module-name></replaceable></screen>
<para>å°å建å为 <replaceable><directory></replaceable> çç®å½ï¼ 模å <replaceable><module-name></replaceable> ç <replaceable><branchname></replaceable> åæ¯çæ件å°è¢«å¤å¶å°è¿ä¸ªç®å½ä¸ã</para>
<para>ä¾å¦ï¼è¦æ£åº <computeroutput>mymodule</computeroutput> 模åç BRANCH-VERSION-1.2 åæ¯ï¼è¿è¡å½ä»¤ï¼</para>
<screen><prompt>$</prompt> <command>cvs co -d mymodule-1.2 -r BRANCH-VERSION-1.2 mymodule</command> </screen>
<para>模åç BRANCH-VERSION-1.2 åæ¯å°è¢«æ£åºå° <filename>mymodule-1.2</filename> ç®å½ä¸ã</para>
<para>è¦æ¥çæ件æåªäºåæ¯åæ è®°ï¼è¿è¡å½ä»¤ï¼</para>
<screen><prompt>$</prompt> <command>cvs status</command> <option>-v</option> <replaceable><filename></replaceable></screen>
<para>ä¾å¦ï¼æ件 <filename>foo.sgml</filename> çç¶æå¦ä¸ï¼</para>
<screen>
<computeroutput>
===================================================================
File: foo.sgml Status: Up-to-date
Working revision: 1.47
Repository revision: 1.47 /cvs/docs/custom-guide/rhl-cg-en.sgml,v
Sticky Tag: (none)
Sticky Date: (none)
Sticky Options: (none)
Existing Tags:
BRANCH-VERSION-1.2 (branch: 1.25.2)
</computeroutput>
</screen>
<para>åªæå¨ <computeroutput>Existing Tags</computeroutput>(ç°ææ è®°)ä¸æ¾ç¤ºä¸º"åæ¯"çæ è®°æå¯ä»¥ä½ä¸ºåæ¯æ£åºã</para>
</section>
</section>
<section id="sn-cvs-cvscommands-up">
<title>æ´æ°æ件</title>
<indexterm>
<primary>cvs</primary>
<secondary>æ´æ°æ件</secondary>
</indexterm>
<para>è¦è·å模åä¸æ件çææ°çæ¬ï¼åæ¢å°å
å«æ¨¡åæ件çç®å½ï¼æ§è¡å½ä»¤ï¼</para>
<screen><prompt>$</prompt> <command>cvs update</command> </screen>
<para>模åæææ件çææ°çæ¬å°ä¸è½½å°æ¬å°ãå¦ææ¨çå°äºæ件å²çªæ示ï¼è¯·åè <xref linkend="sn-cvs-cvscommands-conflicts"/>ã</para>
</section>
<section id="sn-cvs-cvscommands-commit">
<title>æ交æ件</title>
<indexterm>
<primary>cvs</primary>
<secondary>æ交æ件</secondary>
</indexterm>
<para>å¨æ¬å°ä¿®æ¹æ¨¡åçæ件ä¹åï¼å°å®ä»¬æ交ï¼ä»¥å¨ <application>CVS</application> æå¡å¨ä¸ä¿åæ´æ¹ï¼</para>
<screen><prompt>$</prompt> <command>cvs commit</command> <option>-m</option> "<replaceable>some log message</replaceable>" <replaceable>filename</replaceable></screen>
<note>
<para>å¦ææ¨æ³ç¨å欢çææ¬ç¼è¾å¨æ¥æ°åæ¥å¿ä¿¡æ¯ï¼å¹¶ä¸å·²ç»å®ä¹äº $VISUAL æ $EDITOR ç¯å¢åéï¼å°±å¯ä»¥å¿½ç¥ <userinput>-m "some log message"</userinput>ãç¼è¾ç¼å²åºä¸ä¼å
å«ä¸äºæè¿°ä¿®æ¹ç注éï¼æ¨å¨æ·»å èªå·±çæåæ¶ï¼ä¸å¿
å æå®ä»¬ã</para>
</note>
<para>æ¥å¿ä¿¡æ¯åºå½å°½å¯è½ææè¿°æ§ï¼è¿æ ·æ¨åå
±åä½è
é½å¯ä»¥äºè§£åè¿äºåªäºä¿®æ¹ãå¦ææ¥å¿æ¶æ¯æ¯ <userinput>updated some files</userinput>(æ´æ°äºä¸äºæ件)ï¼é£å®æ æ³æè¿°ä¿®æ¹äºä»ä¹ï¼å°æ¥å¯¹æ¨æ¯«æ ç¨å¤ãå¦ææ¨ä¿®æ£äºä¸ä¸ªé误ï¼åºå½å
å« <application>Bugzilla</application> å¼ç¨ã</para>
<para>
<replaceable><filename></replaceable> å¯ä»¥æ¯ä¸ä¸ªæ件åï¼ä¸ç³»åä»¥ç©ºæ ¼åéçæ件åï¼æè
ä¸ç»ä»¥éé
符æå®çæ件åï¼ç±»ä¼¼ <filename>*.png</filename> æ <filename>foo-*.sgml</filename>ã</para>
<para>å¦æå¨ <command>commit</command> å½ä»¤ä¸æ²¡æç»åºæ件åæéé
符ï¼ææä¿®æ¹é½ä¼è¢«æ交å°æå¡å¨ãè¿ä¸ªå½ä»¤æ¯éå½çï¼æ¨¡åä¸ä»»ä½åç®å½çä¿®æ¹ä¹é½ä¼è¢«æ交ãä¸å¸¦æ件åæ§è¡ <command>commit</command> å½ä»¤æ¶è¦å°å¿ï¼å 为æ¨å¯è½ä¸è®°å¾æ¹è¿äºä»ä¹ã</para>
<para>å¦ææ¨çå°äºæ件å²çªï¼è¯·åè <xref linkend="sn-cvs-cvscommands-conflicts"/>ã</para>
</section>
<section id="sn-cvs-cvscommands-add">
<title>æ·»å æ件</title>
<indexterm>
<primary>cvs</primary>
<secondary>æ·»å æ件</secondary>
</indexterm>
<para>è¦å模åæ·»å æ件ï¼å¨æ¬å°ç®å½ä¸å建è¿ä¸ªæ件ï¼ç¶åæ§è¡ä¸é¢çå½ä»¤ï¼</para>
<screen><prompt>$</prompt> <command>cvs add</command> <replaceable>file-to-add</replaceable></screen>
<para>æ·»å æ件ä¹åï¼å¿
é¡» <command>commit</command>(æ交)æ·»å çæ件å°æå¡å¨ï¼</para>
<screen><prompt>$</prompt> <command>cvs commit</command> <option>-m</option> "<replaceable>some log message</replaceable>" <replaceable>file-to-add</replaceable></screen>
</section>
<section id="sn-cvs-cvscommands-admin">
<title>管çäºè¿å¶æ件</title>
<indexterm>
<primary>cvs</primary>
<secondary>äºè¿å¶æ件</secondary>
</indexterm>
<para>é常åæ¡£çæ件æ¯ç®åçææ¬æ件ï¼ä½æ¯ææ¶ä¹ä¼åæ¡£äºè¿å¶æ件ã<application>CVS</application> ç¨åºå¯ä»¥è¯å«å¤§å¤æ°æ件æ©å±åï¼ç±»ä¼¼ <filename>.png</filename> æ <filename>.jpg</filename>ï¼è¿æ ·å°±ä¸ä¼ååäºã</para>
<para>å½æ件被æ£åºæ¶ï¼<application>cvs</application> æ«æå®ï¼æ¥æ¾ç¹æ®çå
³é®åï¼ç±»ä¼¼ "<computeroutput>$id:$</computeroutput>"ï¼ç¶åæ¿æ¢ä¸ºç¸åºçå¼ï¼ ä¾å¦çæ¬å·ã</para>
<para>å
³é®åæ¿æ¢é常ä¼æåäºè¿å¶æ件ï¼å æ¤å¦æ <application>CVS</application> æ æ³æ£ç¡®è¯å«æ件为äºè¿å¶æ件ï¼å¿
é¡»å
³éæ¿æ¢ãæ è¯æ件为äºè¿å¶å°±å
³éäºå
³é®åæ¿æ¢ï¼è¾å
¥å½ä»¤ï¼</para>
<screen width="60"> <prompt>$</prompt> <command>cvs</command> <option>admin</option> <option>-kk</option> <replaceable>filename</replaceable></screen>
<para>注æå¨ä½¿ç¨ <option>admin</option> å½ä»¤åï¼æ件å¿
须已被æ£å
¥ <abbrev>CVS</abbrev> ä»åºãè¿æ ·ä¸ä¼åºéï¼å 为å
³é®åæ©å±æ¯å¨æ件被æ£åºå¹¶å¤å¶å°æ¬å°ç®å½æ¶è¿è¡çï¼èä¸æ¯æ交å°ä»åºä¸çæ¶åã</para>
<tip>
<title>æ¢å¤äºè¿å¶æ件</title>
<para>å¦ææ¨å°äºè¿å¶æ件æ£å
¥ä»åºï¼åç°å®å¨æ£åºæ¶è¢«æåäºï¼ä¸è¦å¿æ¥ãåªè¦è¿è¡ä¸é¢ç <option>admin</option> å½ä»¤ï¼åå ææ¬å°æ件ï¼ç¶åå次æ£åºå°±å¯ä»¥äºã</para>
</tip>
</section>
<section id="sn-cvs-cvscommands-rm">
<title>å é¤æ件</title>
<indexterm>
<primary>cvs</primary>
<secondary>å é¤æ件</secondary>
</indexterm>
<para>å¦æ模åä¸åéè¦æ个æ件ï¼ä½¿ç¨ <command>remove</command> å½ä»¤æ¥å é¤å®ï¼ç¶åç¨ <command>commit</command> å½ä»¤å°å é¤æ交å°æå¡å¨ãå³ä½¿æ¨¡åçå½åçæ¬å é¤äºæ个æ件ï¼è¿ä¸ªæ件çå¯æ¬è¿ä¼è¢«ä¿çå¨æå¡å¨ä¸ï¼å¯ä»¥éæ¶ç¨ <command>add</command> å½ä»¤æ¢å¤ã</para>
<screen><prompt>$</prompt> <command>cvs rm -f</command> <replaceable>file-to-remove</replaceable></screen>
<para>å é¤æ件åï¼å¿
é¡» <command>commit</command>(æ交)å é¤ï¼</para>
<screen><prompt>$</prompt> <command>cvs commit</command> <option>-m</option>"<replaceable>some log message</replaceable>" <replaceable>file-to-remove</replaceable></screen>
<para>å¨ç¨ <command>commit</command> å½ä»¤æ交å é¤æ¶ä¸è½ä½¿ç¨éé
符ãå¿
é¡»æç¡®å°æå®æ件åã</para>
<para>å¦æéè¦éå½åæ个æ件ï¼æå¥½å¨ <application>CVS</application> æå¡å¨ä¸éå½åå®ï¼è¿æ ·æ件çåå²å¯ä»¥ä¿çä¸æ¥ãå¦æéè¦éå½åæ件ï¼å°±å <ulink url="mailto:cvsdocs-administrator at fedora.redhat.com"><filename>cvsdocs-administrator at fedora.redhat.com</filename></ulink> åéä¸å°é®ä»¶ï¼åæè¦éå½åçæ件ã</para>
</section>
<section id="sn-cvs-cvscommands-status">
<title>æ件çç¶æ</title>
<indexterm>
<primary>cvs</primary>
<secondary>æ件çç¶æ</secondary>
</indexterm>
<para>ææ¶éè¦æ¥ç模åä¸æ件ç <firstterm>status</firstterm>(ç¶æ)ãæ§è¡å½ä»¤ï¼</para>
<screen><prompt>$</prompt> <command>cvs status</command> <replaceable>filename</replaceable></screen>
<para>ä»åºæ件çç¶ææ¥åå¦ä¸æ示ï¼</para>
<variablelist>
<varlistentry>
<term>
<computeroutput>Up-to-date</computeroutput>
</term>
<listitem>
<para>æ¨çæ件çæ¬æ£æ¯ <application>CVS</application> æå¡å¨ä¸çææ°çæ¬ã</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<computeroutput>Locally Modified</computeroutput>
</term>
<listitem>
<para>æ¨å·²ä»æå¡å¨ä¸æ´æ°äºææ°ççæ¬ï¼å¹¶ä¸åäºä¿®æ¹ã</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<computeroutput>Locally Added</computeroutput>
</term>
<listitem>
<para>æ¨ä½¿ç¨ <command>cvs add</command> å½ä»¤æ·»å äºæ件ï¼ä½æ¯å°æªæ交æ件çæ·»å ã</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<computeroutput>Locally Removed</computeroutput>
</term>
<listitem>
<para>æ¨ä½¿ç¨ <command>cvs remove</command> å½ä»¤å é¤äºæ件ï¼ä½æ¯å°æªæ交æ件çå é¤ã</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<computeroutput>Needs Checkout</computeroutput>
</term>
<listitem>
<para>æå¡å¨ä¸ææ°çæ¬çæ件ï¼æ¨éè¦æ´æ°ã尽管ç¶æä¸è¯´ï¼éè¦æ£åºï¼å®é
çæææ¯ï¼æ¨éè¦ç¨ <command>cvs update</command> å½ä»¤æ´æ°æ件ã</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<computeroutput>Needs Patch</computeroutput>
</term>
<listitem>
<para>æ¬å°æ件éè¦æè¡¥ä¸ä»¥æ´æ°å°æå¡å¨çææ°çãæ§è¡ <command>cvs update</command> å½ä»¤æ¥è§£å³ã</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<computeroutput>Needs Merge</computeroutput>
</term>
<listitem>
<para>æå¡å¨ä¸ææ´æ°ççæ¬ï¼æ¨çæ¬å°çæ¬å´åäºæªæ交çä¿®æ¹ãè¿ç§æ
åµå¯è½ç»å¸¸åçï¼å¦ææ¨æ²¡æè·åææ°çæ¬å°±è¿è¡ä¿®æ¹çè¯ã</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<computeroutput>File had conflicts on merge</computeroutput>
</term>
<listitem>
<para>类似 <computeroutput>Needs Merge</computeroutput>ï¼ä½æ¯å½æ¨æ§è¡ <command>cvs update</command> å½ä»¤æ¶ï¼å°æ æ³èªå¨è§£å³å²çªãå
³äºå¦ä½è§£å³å²çªè¯·åè <xref linkend="sn-cvs-cvscommands-conflicts"/>ã</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<computeroutput>Unknown</computeroutput>
</term>
<listitem>
<para>
<application>CVS</application> æå¡å¨ä¸ç¥éæ件çä»»ä½ä¿¡æ¯ãå®æ²¡æ被æ¬å°æ·»å æå é¤ï¼ä¹ä»æªæ交å°æå¡å¨ä¸ãè¿ç§æ
åµé常åçå¨ä¸åºè¢«æäº¤å° <application>CVS</application> æå¡å¨çæ件ä¸ï¼ä¾å¦ <filename>generated-index.sgml</filename>ï¼æè
æ¯æ³æ·»å å°ä»åºä½å°æªæ§è¡ <command>cvs add</command> å½ä»¤çæ件ã</para>
</listitem>
</varlistentry>
</variablelist>
</section>
<section id="sn-cvs-cvscommands-conflicts">
<title>解å³å²çª</title>
<indexterm>
<primary>cvs</primary>
<secondary>解å³å²çª</secondary>
</indexterm>
<para>å¦ææ¨ä¿®æ¹äºä¸ä¸ªæ件ï¼èå¦ä¸ä¸ªäººä¿®æ¹äºåæ ·çåºå并ä¸å
æ交äºï¼æ¨å¨æ交æ件ææ´æ°æ¬å°ç®å½æ¶å°±ä¼çå°ç±»ä¼¼ä¸é¢çæ¶æ¯ï¼</para>
<screen>
<computeroutput>
RCS file: /cvs/docs/module-name/filename.sgml,v
retrieving revision 1.12
retrieving revision 1.13
Merging differences between 1.12 and 1.13 into filename.sgml
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in filename.sgml
C filename.sgml
</computeroutput>
</screen>
<para>è¦è§£å³å²çªï¼æå¼æ件ï¼æç´¢ <computeroutput><<<<<<<</computeroutput> ç¶åå¤æåªä¸ªçæ¬ææ¯æ£ç¡®çãä¾å¦ï¼</para>
<screen>
<computeroutput>
<para>
Some sentence.
<<<<<<< filename.sgml
A sentence that was changed in the working copy.
=======
A same sentence that was changed differently and committed.
>>>>>>> 1.13
</para>
</computeroutput>
</screen>
<para>
<computeroutput><<<<<<<</computeroutput> å <computeroutput>=======</computeroutput> ä¹é´çå
容æ¯å·¥ä½ç®å½éåæçã <computeroutput>=======</computeroutput> å <computeroutput>>>>>>>></computeroutput> ä¹é´æ¯æå¡å¨ä¸çå
容ã</para>
<para>ä¿®æ¹æ件ï¼è§£å³å²çªï¼ç¶åæ交å®ã</para>
</section>
<section id="sn-cvs-cvscommands-summary">
<title>å°ç»</title>
<indexterm>
<primary>cvs</primary>
<secondary>å½ä»¤</secondary>
<tertiary>å°ç»</tertiary>
</indexterm>
<para>ææå½ä»¤é½åå®æ¨çå½åç®å½æ¯æ£ç¡®çã</para>
<table frame="all" id="tb-cvs-basic-commands">
<title>åºæ¬ç CVS å½ä»¤</title>
<tgroup cols="2">
<colspec colname="shortcut" colnum="1" colwidth="30"/>
<colspec colname="description" colnum="2" colwidth="60"/>
<thead>
<row>
<entry>å½ä»¤</entry>
<entry>æè¿°</entry>
</row>
</thead>
<tbody>
<row>
<entry>
<command>cvs checkout <replaceable><module-name></replaceable></command> æ <command>cvs co <replaceable><module-name></replaceable></command></entry>
<entry>å建ä¸ä¸ªå为 <replaceable><module-name></replaceable> çç®å½ï¼ å°æ¨¡åå
容æ¾å¨ç®å½ä¸</entry>
</row>
<row>
<entry>
<command>cvs co -d <replaceable><directory></replaceable> -r <replaceable><branchname></replaceable><replaceable><module-name></replaceable></command>
</entry>
<entry>å建 <replaceable><directory></replaceable> ç®å½ï¼å° <replaceable><module-name></replaceable> 模åç <replaceable><branchname></replaceable> åæ¯æ¾å¨ç®å½ä¸ã</entry>
</row>
<row>
<entry>
<command>cvs update</command> æ <command>cvs up</command></entry>
<entry>ä»æå¡å¨å°æ件æ´æ°å°ææ°ç</entry>
</row>
<row>
<entry>
<command>cvs add <replaceable><filename></replaceable></command>
</entry>
<entry>å°æ件 "filename" æ·»å å° CVS æå¡å¨</entry>
</row>
<row>
<entry>
<command>cvs commit -m "My message" <replaceable><filename></replaceable></command>
</entry>
<entry>å°æ¬å°è®¡ç®æºä¸çæ件 <replaceable><filename></replaceable> æ交为ææ°ç</entry>
</row>
<row>
<entry>
<command>cvs log <replaceable><filename></replaceable></command>
</entry>
<entry>æ¥çæ件 <replaceable><filename></replaceable> çæ交信æ¯</entry>
</row>
<row>
<entry>
<command>cvs status <replaceable><filename></replaceable></command>
</entry>
<entry>æ¥çæ件çç¶æï¼ç±»ä¼¼ <computeroutput>Locally
Modified</computeroutput></entry>
</row>
<row>
<entry>
<command>cvs status -v <replaceable><filename></replaceable></command>
</entry>
<entry>æ¥çæ件ç°æçæ ç¾ååæ¯</entry>
</row>
<row>
<entry>
<command>cvs diff <replaceable><filename></replaceable></command>
</entry>
<entry>æ¥çæ件çå·¥ä½çæ¬ä¸åæ¯ä¸çææ°çæ¬çä¸åä¹å¤</entry>
</row>
<row>
<entry>
<command>cvs diff -r1.1 -r1.2 <replaceable><filename></replaceable></command>
</entry>
<entry>æ¥çæ件 1.1 å 1.2 çæ¬çä¸åä¹å¤</entry>
</row>
</tbody>
</tgroup>
</table>
<para>请é
读系ç»ä¸ç CVS æåæ¥è·åæ´å¤ä¿¡æ¯ï¼ä½ç½®æ¯ <filename>/usr/share/doc/cvs-<replaceable><version-number></replaceable>/cvs.ps</filename> (CVS çæ¬å¯è½ææä¸å)ãè¿å¯ä»¥è®¿é® CVS 主页ï¼ä½ç½®æ¯ <ulink url="http://www.cvshome.org/">http://www.cvshome.org/</ulink>ã</para>
<tip>
<title>æå·§</title>
<para>ç±äº <application>CVS</application> ä½¿ç¨ <application>ssh</application> æ¥è¿æ¥ <application>CVS</application> æå¡å¨ï¼å¨ååº <application>CVS</application> 请æ±åï¼æ¨å°è¢«æ示è¾å
¥å¯ç ãå¦ææ¨æç®é
ç½®ä¸ä¸ï¼çå»è¾å
¥å¯ç çæ¥éª¤ï¼è¯·åè <ulink url="http://redhat.com/docs/manuals/linux/RHL-9-Manual/custom-guide/s1-openssh-client-config.html"><citetitle>&RH; Linux 9 Customization Guide</citetitle></ulink>(å®å¶æå)ä¸ä½¿ç¨ <command>ssh-agent</command> çç»èã</para>
</tip>
</section>
</section>
</chapter>
- Previous message: docs-common/images watermark-zh_CN.png, NONE, 1.1 watermark-zh_CN.svg, NONE, 1.1
- Next message: documentation-guide acknowledgments-zh_CN.xml, NONE, 1.1 docs-converting-zh_CN.xml, NONE, 1.1 docs-emacs-nxml-zh_CN.xml, NONE, 1.1 docs-emacs-zh_CN.xml, NONE, 1.1 docs-getting-files-zh_CN.xml, NONE, 1.1 docs-intro-zh_CN.xml, NONE, 1.1 docs-rh-guidelines-zh_CN.xml, NONE, 1.1 docs-style-zh_CN.xml, NONE, 1.1 docs-tutorial-zh_CN.xml, NONE, 1.1 docs-vim-zh_CN.xml, NONE, 1.1 docs-xml-tags-zh_CN.xml, NONE, 1.1 documentation-guide-zh_CN.xml, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the docs-commits
mailing list