assets/docs/ddCVS_cvscontributing.html.ja - openoffice-org - Git at Google

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/2000/REC-xhtml1-20000126/DTD/xhtml1-strict.dtd">

 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
 <style type="text/css">
 /* <![CDATA[ */ @import "/branding/css/tigris.css"; /* ]]> */
 </style>
   <script src="/branding/scripts/sc.js" type="text/javascript"></script>
   <link rel="stylesheet" type="text/css" href="/branding/css/print.css" media="print" />

   <title>\[XR[hÏXÌñe</title>
  </head>

  <body class="docs" onload="self.focus()">
   <div class="docs" id="ddcvscvscontributing">
    <h2>R}hC CVS Éæé\[XR[hÏXÌñe</h2>

    <div id="toc">
     <ul>
      <li><strong><a href="/nonav/servlets/HelpTOC">wvõø</a></strong></li>
     </ul>

     <ul>
      <li>
       <a href="/nonav/docs/ddCVS.html">CVS ðgpµ½\[XR[ho[WÇÉÂ¢Ä</a>

       <ul>
        <li><a href="/nonav/docs/ddCVS_cvsglossary.html">o[WÇObT</a></li>

        <li><a href="/nonav/docs/ddUsingCVS_command-line.html">CVS R}hCÉæévWFNgE\[Xt@CÖÌANZX</a></li>

        <li>
         CVS Éæé\[XR[hÏXÌñe

         <ul>
          <li><a href="#cvscommit">t@CÆfBNgÌR~bg</a></li>

          <li><a href="#cvsadd">Vµ¢t@CÆfBNgÌÇÁ</a></li>

          <li><a href="#work">t@CÌæèµ¢ÉÂ¢Ä</a></li>

          <li><a href="#filetypes">t@C`®ÉÂ¢Ä</a></li>

          <li><a href="#cvsupdate">ìÆpRs[ðÅVÌóÔÉÛÂ±Æ (CVS XV)</a></li>

          <li><a href="#cvstatus">ìÆpt@CÆ CVS |WgÌär</a></li>

          <li><a href="#otherdiff">R~bg·éOÌt@CÌär</a></li>

          <li><a href="#cvsmerging">ÏXÌ}[W</a></li>

          <li><a href="#cvsresolving">}[W·éÛÌRtNgÌðÁ</a></li>

          <li><a href="#reverting">rWðÆ</a></li>
         </ul>
        </li>

        <li><a href="/nonav/docs/ddCVS_cvsmanaging.html">CVS ðgÁ½vWFNgt@CÆfBNgÌÇ</a></li>
       </ul>
      </li>
     </ul>
    </div>

    <h3><a id="contributing" name="contributing">ÏXÌ CVS ÖÌñe</a></h3>

    <p><a id="cvscommit" name="cvscommit"></a>t@CÖÌÏXð¤L|WgÉ<i>R~bg</i>·éÉÍAÌR}hðüÍµÜ·B</p>

    <p><code>cvs commit -m "±±ÉÏXbZ[WðüÍ" filename</code></p>

    <p>t@CÖÌÏXÉÖ·éà¾ðÜßÈ©Á½êÍACVS ªR~bgìð®¹·éOÉAt@CEGfB^ðÀsµÄà¾ðÁ¦éæ¤Év³êÜ·B</p>

    <p>fBNgÆ»ÌTufBNgÉ é·×ÄÌt@CÖÌÏXðR~bg·éÉÍAÌR}hðüÍµÜ·B</p>
 <pre>
 <code>cd top_directory_to_commit
 cvs commit -m "±±ÉÏXbZ[WðüÍ"
 </code>
 </pre>

    <p>·×ÄÌR~bgÍA©®IÉL^³êAvWFNgÌ CVS [OXgÉf¦³êÜ·B</p>

    <h3><a id="cvsadd" name="cvsadd">t@C/fBNgÌÇÁ</a></h3>

    <p>©ªÌ[LOEfBNgÅt@Cðì¬µAÒWµ½ãÅ±ÌVµ¢t@Cð CVS |WgÉ<i>ÇÁ</i>·éÉÍAÌR}hðüÍµÜ·B</p>

    <p><code>cvs add filename</code></p>

    <p>ÉuCVS Ìt@C¼R~bgvR}hð±¯Ü·B ÅÉt@CðÇÁµÈ©Á½êÍACVS Ít@CðF¯Å«Ü¹ñB</p>

    <p>CVS ÖÌ«Ý Àª éêÍAu<b>cvs add</b>vR}hðgÁÄvWFNgÌ\[Xc[ÉTufBNgðÇÁÅ«Ü·B»ê©çAu<b>cvs move</b>vR}hðgÁÄù¶Ìt@CðVµ¢TufBNgÉÚ®Å«Ü·B</p>

    <p>Ó: CVS ÌfBNgÉ¼Oðt¯éÆ«ÉÍAÓµÄs¤æ¤ÉµÄ¾³¢B CVS Ì|WgÉÍA³Ü´ÜÈIy[eBOVXeðgpµÄ¢é[UªANZXµÜ·BfBNg¼Égpµ½¶ªÇßÈ¢[Uª¢é©àµêÜ¹ñB©ªÌIy[eBOVXeÅÍA.A~A/A\ â»Ì¼Ì¶ðfBNg¼ÆµÄgpÅ«éêÅàAfBNgÉANZXðKvÆ·éÙ©Ì[Uªt@C\¬XL[}ðgpÅ«È¢êª èÜ·BÙ©Ì[UÆÌâèðð¯éÉÍAfBNg¼ÉÌ¶ÌÝðgp·éæ¤ÉµÜ·B</p>

    <blockquote>
     <p>a`zAA`ZA0`9A¨æÑ _ (A_[XRA)</p>
    </blockquote>

    <p>»Ì¼Ì¶ðÇÁ·éÆAfBNg¼ªÙ©ÌIy[eBOVXeðgp·é[UªÇßÈÈé±Æª èÜ·B</p>

    <ul>
     <li><a href="http://cvsbook.red-bean.com/cvsbook.html#Committing">ÏXðR~bg·é±ÆÉÂ¢ÄÌÚ×</a></li>

     <li><a href="http://cvshome.org/docs/manual/cvs_7.html#SEC66">t@CÆfBNgÌÇÁÉÂ¢ÄÌÚ×</a></li>
    </ul>

    <h3><a id="work" name="work">t@CÌæèµ¢ÉÂ¢Ä</a></h3>

    <p>vWFNgÌ|Wg©çÌt@CÌ`FbNAEgÆ|WgÖÌ`FbNCÌÔÅAt@CªÇÌæ¤ÉvWFNgÂ«ârhEvZXÅgp³ê½©ÉÂ¢ÄÍACVS ÉÍÙÆñÇÖWª èÜ¹ñB ±êÍAvWFNgÌI[iÆvWFNgÉÁLÌ»Ì¼ÌOvöÉæÁÄxz³êÜ·B</p>

    <p>ù¶Ìt@CÉÏXðÁ¦éêÍA©ªÌIðµ½t@CEGfB^ðgÁÄ[J}VãÅ±êçÌt@CÌìÆpRs[ðÒWµÜ·BìÆpRs[ÉÁ¦½ÏXÍAt@CÌÏXµ½o[Wð`FbNC (<i>cvs commit</i> ÌÀs) ÜÅÍAvWFNgÌ\[XE|Wgâ¼ÌJÒÌìÆÉÍSe¿µÜ¹ñB</p>

    <p>ÚµÍA<a href="http://www.cvshome.org/docs/manual/cvs_1.html#SEC1">CVS ªsíÈ¢±Æ</a>ðQÆµÄ¾³¢B</p>

    <h3><a id="filetypes" name="filetypes">t@C`®ÉÂ¢Ä</a></h3>

    <p>CVS R}hÆìÉÂ¢Ä±ÌhLgÉLÚ³êÄÄ¢éîñÍAìÆµÄ¢évWFNgEt@CªeLXgEt@CÅ é±ÆðzèµÄ¢Ü·BCVS Ìo[WÇÉoCiEt@CðÜßéÂ\«ª éêÍAÁÊÈâèª¢Â© èÜ·B</p>

    <p>ÚµÍACVS Ì<a href="http://cvshome.org/docs/manual/cvs_9.html#SEC80">oCit@CÌnhO</a> ðQÆµÄ¾³¢B</p>

    <h3><a id="cvsupdate" name="cvsupdate">ìÆpt@CÆ|Wgt@CÌútð¯¶úÉÛ·é</a></h3>

    <p>t@CÌìðs¤OÉt@CÌóÔðmè½¢êÍAÌR}hðgÁÄvWFNgÌ|WgÆútªÁÄ¢È¢[JEfBNgÌt@CEXgð\¦Å«Ü·B</p>

    <p><code>cvs -qn update</code></p>

    <p>e¿·éfBNgÜ½ÍTufBNgÉ ét@CÆ»ÝÌXe[^XªÌæ¤É¦³êÜ·B</p>

    <ul>
     <li>? = t@Cª CVS ÅF¯³êÜ¹ñ (ÇÁµÄR~bg·éKvª èÜ·)B</li>

     <li>A = t@CªÇÁ³êACVS ªF¯µÄ¢Ü·ªA|WgÉR~bgµÈ¯êÎÈèÜ¹ñB</li>

     <li>M = ìÆpRs[ð`FbNAEgµÄ©çt@CªÙ©ÌJÒÉæÁÄÏX³êÄ¢Ü·B ±êÍAt@CÌXVªKvÅ é±ÆðÓ¡µÜ·B</li>

     <li>U = t@CªXV³êÄ¢Ü·B</li>

     <li>C = }[W·éÛt@CÉèìÆÅðµÈ¯êÎÈçÈ¢£ª èÜ·B</li>
    </ul>

    <p>ÀÛÉXVðÀsµÄ[LOEfBNgð|WgÉ¯ú³¹éÉÍAÌR}hðüÍµÜ·B</p>

    <p><code>cvs update</code></p>

    <p>±ÌR}hÉt@C¼ðÇÁµÄAÂÊÌt@CðXV·é±ÆàÅ«Ü·B</p>

    <p>Ü½ÍAXV·éÆ«ÉVµ¢fBNgðÜßéÉÍAÌR}hðÀsµÜ·B</p>

    <p><code>cvs update -d</code></p>

    <ul>
     <li><a href="http://www.gnu.org/manual/cvs/html_chapter/cvs_20.html#SEC132">CVS XVR}hÉÂ¢ÄÌÚ×</a></li>

     <li><a href="http://www.gnu.org/manual/cvs/html_chapter/cvs_20.html#SEC134">CVS XVAEgvbgÉÂ¢ÄÌÚ×</a></li>
    </ul>

    <h3><a id="cvstatus" name="cvstatus">ìÆpt@CÆ CVS |WgÌär</a></h3>

    <p>|WgÌÅVo[WÆ©ªÌìÆpRs[ª¯úµÄ¢é©ð©éà¤ 1 ÂÌû@ÍAÌR}hðgp·éû@Å·B</p>

    <p><code>cvstatus</code></p>

    <p>Ü½ÍAÂÊÌt@CEXe[^XðmF·éÉÍAÌR}hðgpµÜ·B</p>

    <p><code>cvs status filename</code></p>

    <p>±ÌärÉæèAÌ¤¿¢¸ê©ÌbZ[WªÔ³êÜ·B</p>

    <dl>
     <dt>Locally modified ([JÅC³ÏÝ)</dt>

     <dd>t@CðÒWµÜµ½ªAÏXªR~bg³êÄ¢Ü¹ñB</dd>

     <dt>Locally Added ([JÅÇÁÏÝ)</dt>

     <dd>t@CðÇÁµÜµ½ªAÏXªR~bg³êÄ¢Ü¹ñB</dd>

     <dt>Locally Removed ([JÅíÏÝ)</dt>

     <dd>uremovevðgÁÄt@CðíµÜµ½ªAÏXªR~bg³êÄ¢Ü¹ñB</dd>

     <dt>Needs Checkout (`FbNAEgªKv) </dt>

     <dd>Ù©Ì[UªVµ¢rWð|WgÉR~bgµÄ¢Ü·B±ÌbZ[WÍìð³mÉ\µÄ¢È¢©àµêÜ¹ñBÊíAVµ¢rWðæ¾·éêÉÍu`FbNAEgvÅÍÈuXVvÆ¢¤pêðgpµÜ·B</dd>

     <dt>Needs Patch (pb`ªKv)</dt>

     <dd>u`FbNAEgªKvuÆ¯¶ACVS T[oªt@CSÌÅÍÈpb`ðMµÜ·Bpb`Ü½Ít@CSÌðM·é±ÆÍ¯¶ÊÆÈèÜ·B</dd>

     <dt>Needs Merge (}[WªKv) </dt>

     <dd>Ù©Ì[UªæèVµ¢rWð|WgÉR~bgµÜµ½B³çÉA©ªàt@CÉÏXðÁ¦Ä¢Ü·B </dd>

     <dt>File had conflicts on merge (t@CÉ}[WãÌ£ª èÜ·B) </dt>

     <dd>±êÍAu[JÅC³ÏÝvÆ¯¶Å·ªAOÌuupdatevR}hðÀs·éÆ£ª¶µÄACVS ªÁ¦½ÏXððÅ«Ü¹ñB
   Ü¸A<a href="#cvsresolving">RtNgÌð</a>ðÀsµÈ¯êÎÈèÜ¹ñB</dd>

     <dt>s¾</dt>

     <dd>CVS Í±Ìt@CÉÖµÄîñðÁÄ¢Ü¹ñB ½Æ¦ÎAVµ¢t@Cðì¬µ½ªAucvs addvðÜ¾ÀsµÄ¢È¢æ¤ÈêÉ¶µÜ·B</dd>
    </dl>

    <p>êÊIÉA<I>t@CÌÏXðR~bg·é¼OÉ</I>A|WgÆìÆpt@Cª¯úµÄ¢é©ðmF·é±Æð¨©ßµÜ·B±êÍAÙÈéfBNg©çR~bgµ½èA©ªª|Wg©ç`FbNAEgµ½èÅãÉXVµ½ãÅAÙ©ÌJÒª¯¶t@CÉÏXðÁ¦½êÈÇÌRÅAR~bgª³µÀsÅ«È¢±Æª é½ßÅ·B¯¶t@CÌÃ¢o[WÉÎµAÏXðR~bgµæ¤Æ·éÆACVS ª±êçð}[W·éÆ«É£ª¶µâ·ÈèÜ·B±Ìæ¤ÈóÔÅR~bgµæ¤Æ·éÆACVS ©çudying gaspsvÌbZ[Wª\¦³êé±Æª èÜ·B </p>

    <p>t@CÌRs[Æ|WgÌÅVo[WÆÌ·ð\¦·éÉÍAÌR}hðüÍµÜ·B</p>

    <p><code>cvs diff filename</code></p>

    <p><a href="http://cvsbook.red-bean.com/cvsbook.html#Finding_Out_What_You__And_Others__Did_--_update_And_diff">vWFNg|WgÆ©ªÌìÆÉÂ¢ÄÌÚ×</a></p>

    <h3><a id="otherdiff" name="otherdiff">·ðR~bg·é<i>OÉ</i>At@CÌo[Wðär·é</a></h3>

    <p>©ªÌÏXðR~bg·é<i>OÉ</i>A¯¶t@CÉÙ©ÌJÒªÁ¦½ÏXð\¦µ½¢êª èÜ·B
 ½Æ¦ÎAñíÉ¡GÈÏXðR~bgµæ¤ÆµÄ¢éêÅAÙ©ÌJÒÌìÆÆ£ª\z³êéæ¤ÈêÅ·B</p>

    <p>±ÌêÍAÊÌt@C¼Å©ªÌìÆpt@CðÛ¶µÄ¨«Ü· (u filename-newvÈÇjB »ê©çA<b>cvs update</b>R}hðÀsµÄA|WgÌÅVo[WÆ©ªÌt@CðÏXðR~bg·éOÉärµÜ·B Ì diff R}hðgÁÄA2 ÂÌt@Cð¡ÉÀ×Äär·é±ÆàÅ«Ü·B</p>

    <p><code>diff -y filename filename-new</code></p>

    <h3><a id="cvsmerging" name="cvsmerging">Ù©ÌJÒÌÏXÉ©ªÌÏXð}[W·é</a></h3>

    <p><b>ucvs updatev</b> R}hðÀs·é±ÆÍACVS É|WgÌÅVo[Wð©ªÌìÆpRs[É}[W·é±ÆÆ¯¶Å·B</p>

    <p>µ©µAÅãÉXVµÄ©çt@CÉÁ¦çê½ÏXªA©ªÌÏXÆíÈ¢êª èÜ·BÜ½ÍA|WgÌo[WàÅ£·éÏXð©ªªÁ¦½æ¤Èêà èÜ·B CVS ÍAXVµÄR~bg·éÛÉA±Ìæ¤È£ðÅ«é¾¯©®IÉðµæ¤ÆÝÜ·ªA·×ÄððÅ«È¢êª èÜ·B±ÌêAt@CàÌ£ÍAèìÆÅðµÈ¯êÎÈèÜ¹ñB</p>

    <h3><a id="cvsresolving" name="cvsresolving">}[W·éÛÌRtNgÌðÁ</a></h3>

    <p>}[WERtNgðð·éÉÍAt@CEGfB^Åt@CðJ«Ü·B<b>&gt;&gt;&gt;&gt;&gt;&gt;</b> and <b>&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;</b>Å}[N³êÄ¢ésâZNVðTµÜ·B CVS ªRtNgððÅ«È¢êÍA¼o[WÉe¿·ésâZNVðt@CÉÜßÜ·BÅVÌo[WªÊíæÉ}ü³êÜ·BRtNgððÁ·éìÆÍAsKvÈsÆRtNgÌLârWÔÈÇðÜÞsðí·é±ÆÅ·B
 »ê©çAt@CðÛ¶µÄÄxR~bgµÜ·B</p>

    <ul>
     <li><a href="http://www.gnu.org/manual/cvs/html_chapter/cvs_7.html#SEC40">RtNgÌá</a></li>

     <li><a href="http://cvsbook.red-bean.com/cvsbook.html#Detecting_And_Resolving_Conflicts">RtNgÌðÉÂ¢ÄÌÚ×</a></li>
    </ul>

    <h3><a id="reverting" name="reverting">rWðÆ</a></h3>

    <p><b>cvs log</b>R}hðgÁÄt@CÌÏXðð\¦·é±ÆÈOÉA<i></i>vZXðgÁÄÈOÌt@CErWðÅVÌo[WÆµÄÀÛÉ³¹é±ÆªÅ«Ü·(u|WgÌwbhvÉ³³êÜ·)B ±êÍA¢©ÈéRª éÆµÄàAt@CðÈOÌo[WÉß·Kvª éêÉÖÅ·BJvWFNgÉóê½rhâÙ©Ìâèª éêÍA±êÍÅàÖÅÍÈo[WÇ@\ÉÈèÜ·B</p>

    <p>>Ó: urWvÆuo[WvÌá¢ð¬¯·é±Æª èÜ·B <i>rW</i>ÍAÂXÌt@CÌÁèÌAbvf[gÅArWÔÍ 1.1A1.2A1.3 ÈÇÆÈèÜ·B ucvs log filenamevR}hðÀs·éÆAÁèÌt@CÌrWÔª·×Ä\¦³êÜ·BêûA<i>o[W</i>ÍAt@CErWÌ<b><i>Zbg</i></b>ÅAÁèÌ_Å^Ot¯³ê¼Oªt¯çêÜ·Bo[WÍt@CÌrWÆ¯lÉ¼Oªt¯çêé½ßA¬¯µâ·ÈÁÄ¢Ü· (1.0A1.1A1.2 ÈÇ)Bµ©µAo[WÍ±Ìû@Å¼Oðt¯éKvÍ èÜ¹ñBvWFNgI[iªwèµ½CÓÌ¶ñâAÙÈéÔXL[ðgpÅ«Ü·B</p>

    <p>Ü¸Aðs¤OÉA»ÝÌ|WgEwbhÉ ét@CEo[WÆµæ¤ÆµÄ¢éo[WÔÌ·ðmF·é±Æð¨©ßµÜ·B±êÉÍAÌR}hðgpµÜ·B</p>

    <p><code>cvs diff -c -r version# -r version# filename</code></p>

    <p>±êÉæèAµæ¤Æ·éOÉA2 ÂÌt@CðärÅ«Ü·B 2 ÂÌo[WðæÊÅ«éÀèA±ÌR}hÌÊÍv½IÈàÌÉÍÈèÜ¹ñB</p>

    <p>Égp·éR}hÉÍAo[WÔÌ[Éµµ]¤±ÆªKvÅ·BÅVÌo[W©çÈOÌo[WÉ·éÉÍAÌR}hðüÍµÜ·B</p>

    <p><code>cvs update -j later_version# -j earlier_version# filename</code></p>

    <p>ÉÍA¡Ìû@ª é½ßAÌÚàQÆµÄ¾³¢:<br />
     <a href="http://cvsbook.red-bean.com/cvsbook.html#Examining_And_Reverting_Changes">ÉÂ¢ÄÌÚ×</a><br />
     <a href="http://www.gnu.org/manual/cvs/html_chapter/cvs_16.html#SEC72">rWðÉÂ¢ÄÌÚ×</a></p>

    <p>ÍAuXeBbL[E^OvG[ðµêª éÆ¢¤±ÆÉàÓµÄ¾³¢B±êÍAÌXVR}hÉÁÊÈXCb`ðgÁÄðÅ«Ü·B</p>

    <p><code>cvs update -dAP</code></p>

    <p>(<a href="http://cvsbook.red-bean.com/cvsbook.html#Getting_Snapshots__Dates_And_Tagging_">XeBbL|^OG[ÆÍ?</a>)</p>
    <!--

           <h3><a name="cvstips">Feedback on this document</a></h3>
         <p>
           The author of this help document has made every attempt to compile accurate, helpful information about using CVS for projects hosted on this site. If you think any content in the above document is wrong, inadequate, or something is just plain missing ... that's good. This is open source, so step up to the plate and contribute your suggestions for additions and improvements.
           </p> -->

    <p>æèÚµ¢ CVS Ìwv: <a href="/nonav/docs/ddCVS_cvsmanaging.html">R}hC CVS ðgÁ½vWFNgt@CÆfBNgÌÇ</a></p>

    <div class="courtesylinks">
     <p><a href="#toc">gbv</a> | <a href="/nonav/servlets/HelpTOC">wvõø</a></p>
    </div>
   </div>
  </body>
 </html>
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
	"http://www.w3.org/TR/2000/REC-xhtml1-20000126/DTD/xhtml1-strict.dtd">

	<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
	<style type="text/css">
	/* <![CDATA[ / @import "/branding/css/tigris.css"; / ]]> */
	</style>
	<script src="/branding/scripts/sc.js" type="text/javascript"></script>
	<link rel="stylesheet" type="text/css" href="/branding/css/print.css" media="print" />

	<title>\[XR[hÏXÌñe</title>
	</head>

	<body class="docs" onload="self.focus()">
	<div class="docs" id="ddcvscvscontributing">
	<h2>R}hC CVS Éæé\[XR[hÏXÌñe</h2>

	<div id="toc">
	<ul>
	<li><strong><a href="/nonav/servlets/HelpTOC">wvõø</a></strong></li>
	</ul>

	<ul>
	<li>
	<a href="/nonav/docs/ddCVS.html">CVS ðgpµ½\[XR[ho[WÇÉÂ¢Ä</a>

	<ul>
	<li><a href="/nonav/docs/ddCVS_cvsglossary.html">o[WÇObT</a></li>

	<li><a href="/nonav/docs/ddUsingCVS_command-line.html">CVS R}hCÉæévWFNgE\[Xt@CÖÌANZX</a></li>

	<li>
	CVS Éæé\[XR[hÏXÌñe

	<ul>
	<li><a href="#cvscommit">t@CÆfBNgÌR~bg</a></li>

	<li><a href="#cvsadd">Vµ¢t@CÆfBNgÌÇÁ</a></li>

	<li><a href="#work">t@CÌæèµ¢ÉÂ¢Ä</a></li>

	<li><a href="#filetypes">t@C`®ÉÂ¢Ä</a></li>

	<li><a href="#cvsupdate">ìÆpRs[ðÅVÌóÔÉÛÂ±Æ (CVS XV)</a></li>

	<li><a href="#cvstatus">ìÆpt@CÆ CVS \|WgÌär</a></li>

	<li><a href="#otherdiff">R~bg·éOÌt@CÌär</a></li>

	<li><a href="#cvsmerging">ÏXÌ}[W</a></li>

	<li><a href="#cvsresolving">}[W·éÛÌRtNgÌðÁ</a></li>

	<li><a href="#reverting">rWðÆ</a></li>
	</ul>
	</li>

	<li><a href="/nonav/docs/ddCVS_cvsmanaging.html">CVS ðgÁ½vWFNgt@CÆfBNgÌÇ</a></li>
	</ul>
	</li>
	</ul>
	</div>

	<h3><a id="contributing" name="contributing">ÏXÌ CVS ÖÌñe</a></h3>

	<p><a id="cvscommit" name="cvscommit"></a>t@CÖÌÏXð¤L\|WgÉ<i>R~bg</i>·éÉÍAÌR}hðüÍµÜ·B</p>

	<p><code>cvs commit -m "±±ÉÏXbZ[WðüÍ" filename</code></p>

	<p>t@CÖÌÏXÉÖ·éà¾ðÜßÈ©Á½êÍACVS ªR~bgìð®¹·éOÉAt@CEGfB^ðÀsµÄà¾ðÁ¦éæ¤Év³êÜ·B</p>

	<p>fBNgÆ»ÌTufBNgÉ é·×ÄÌt@CÖÌÏXðR~bg·éÉÍAÌR}hðüÍµÜ·B</p>
	<pre>
	<code>cd top_directory_to_commit
	cvs commit -m "±±ÉÏXbZ[WðüÍ"
	</code>
	</pre>

	<p>·×ÄÌR~bgÍA©®IÉL^³êAvWFNgÌ CVS [OXgÉf¦³êÜ·B</p>

	<h3><a id="cvsadd" name="cvsadd">t@C/fBNgÌÇÁ</a></h3>

	<p>©ªÌ[LOEfBNgÅt@Cðì¬µAÒWµ½ãÅ±ÌVµ¢t@Cð CVS \|WgÉ<i>ÇÁ</i>·éÉÍAÌR}hðüÍµÜ·B</p>

	<p><code>cvs add filename</code></p>

	<p>ÉuCVS Ìt@C¼R~bgvR}hð±¯Ü·B ÅÉt@CðÇÁµÈ©Á½êÍACVS Ít@CðF¯Å«Ü¹ñB</p>

	<p>CVS ÖÌ«Ý Àª éêÍAu<b>cvs add</b>vR}hðgÁÄvWFNgÌ\[Xc[ÉTufBNgðÇÁÅ«Ü·B»ê©çAu<b>cvs move</b>vR}hðgÁÄù¶Ìt@CðVµ¢TufBNgÉÚ®Å«Ü·B</p>

	<p>Ó: CVS ÌfBNgÉ¼Oðt¯éÆ«ÉÍAÓµÄs¤æ¤ÉµÄ¾³¢B CVS Ì\|WgÉÍA³Ü´ÜÈIy[eBOVXeðgpµÄ¢é[UªANZXµÜ·BfBNg¼Égpµ½¶ªÇßÈ¢[Uª¢é©àµêÜ¹ñB©ªÌIy[eBOVXeÅÍA.A~A/A\ â»Ì¼Ì¶ðfBNg¼ÆµÄgpÅ«éêÅàAfBNgÉANZXðKvÆ·éÙ©Ì[Uªt@C\¬XL[}ðgpÅ«È¢êª èÜ·BÙ©Ì[UÆÌâèðð¯éÉÍAfBNg¼ÉÌ¶ÌÝðgp·éæ¤ÉµÜ·B</p>

	<blockquote>
	<p>a`zAA`ZA0`9A¨æÑ _ (A_[XRA)</p>
	</blockquote>

	<p>»Ì¼Ì¶ðÇÁ·éÆAfBNg¼ªÙ©ÌIy[eBOVXeðgp·é[UªÇßÈÈé±Æª èÜ·B</p>

	<ul>
	<li><a href="http://cvsbook.red-bean.com/cvsbook.html#Committing">ÏXðR~bg·é±ÆÉÂ¢ÄÌÚ×</a></li>

	<li><a href="http://cvshome.org/docs/manual/cvs_7.html#SEC66">t@CÆfBNgÌÇÁÉÂ¢ÄÌÚ×</a></li>
	</ul>

	<h3><a id="work" name="work">t@CÌæèµ¢ÉÂ¢Ä</a></h3>

	<p>vWFNgÌ\|Wg©çÌt@CÌ`FbNAEgÆ\|WgÖÌ`FbNCÌÔÅAt@CªÇÌæ¤ÉvWFNgÂ«ârhEvZXÅgp³ê½©ÉÂ¢ÄÍACVS ÉÍÙÆñÇÖWª èÜ¹ñB ±êÍAvWFNgÌI[iÆvWFNgÉÁLÌ»Ì¼ÌOvöÉæÁÄxz³êÜ·B</p>

	<p>ù¶Ìt@CÉÏXðÁ¦éêÍA©ªÌIðµ½t@CEGfB^ðgÁÄ[J}VãÅ±êçÌt@CÌìÆpRs[ðÒWµÜ·BìÆpRs[ÉÁ¦½ÏXÍAt@CÌÏXµ½o[Wð`FbNC (<i>cvs commit</i> ÌÀs) ÜÅÍAvWFNgÌ\[XE\|Wgâ¼ÌJÒÌìÆÉÍSe¿µÜ¹ñB</p>

	<p>ÚµÍA<a href="http://www.cvshome.org/docs/manual/cvs_1.html#SEC1">CVS ªsíÈ¢±Æ</a>ðQÆµÄ¾³¢B</p>

	<h3><a id="filetypes" name="filetypes">t@C`®ÉÂ¢Ä</a></h3>

	<p>CVS R}hÆìÉÂ¢Ä±ÌhLgÉLÚ³êÄÄ¢éîñÍAìÆµÄ¢évWFNgEt@CªeLXgEt@CÅ é±ÆðzèµÄ¢Ü·BCVS Ìo[WÇÉoCiEt@CðÜßéÂ\«ª éêÍAÁÊÈâèª¢Â© èÜ·B</p>

	<p>ÚµÍACVS Ì<a href="http://cvshome.org/docs/manual/cvs_9.html#SEC80">oCit@CÌnhO</a> ðQÆµÄ¾³¢B</p>

	<h3><a id="cvsupdate" name="cvsupdate">ìÆpt@CÆ\|Wgt@CÌútð¯¶úÉÛ·é</a></h3>

	<p>t@CÌìðs¤OÉt@CÌóÔðmè½¢êÍAÌR}hðgÁÄvWFNgÌ\|WgÆútªÁÄ¢È¢[JEfBNgÌt@CEXgð\¦Å«Ü·B</p>

	<p><code>cvs -qn update</code></p>

	<p>e¿·éfBNgÜ½ÍTufBNgÉ ét@CÆ»ÝÌXe[^XªÌæ¤É¦³êÜ·B</p>

	<ul>
	<li>? = t@Cª CVS ÅF¯³êÜ¹ñ (ÇÁµÄR~bg·éKvª èÜ·)B</li>

	<li>A = t@CªÇÁ³êACVS ªF¯µÄ¢Ü·ªA\|WgÉR~bgµÈ¯êÎÈèÜ¹ñB</li>

	<li>M = ìÆpRs[ð`FbNAEgµÄ©çt@CªÙ©ÌJÒÉæÁÄÏX³êÄ¢Ü·B ±êÍAt@CÌXVªKvÅ é±ÆðÓ¡µÜ·B</li>

	<li>U = t@CªXV³êÄ¢Ü·B</li>

	<li>C = }[W·éÛt@CÉèìÆÅðµÈ¯êÎÈçÈ¢£ª èÜ·B</li>
	</ul>

	<p>ÀÛÉXVðÀsµÄ[LOEfBNgð\|WgÉ¯ú³¹éÉÍAÌR}hðüÍµÜ·B</p>

	<p><code>cvs update</code></p>

	<p>±ÌR}hÉt@C¼ðÇÁµÄAÂÊÌt@CðXV·é±ÆàÅ«Ü·B</p>

	<p>Ü½ÍAXV·éÆ«ÉVµ¢fBNgðÜßéÉÍAÌR}hðÀsµÜ·B</p>

	<p><code>cvs update -d</code></p>

	<ul>
	<li><a href="http://www.gnu.org/manual/cvs/html_chapter/cvs_20.html#SEC132">CVS XVR}hÉÂ¢ÄÌÚ×</a></li>

	<li><a href="http://www.gnu.org/manual/cvs/html_chapter/cvs_20.html#SEC134">CVS XVAEgvbgÉÂ¢ÄÌÚ×</a></li>
	</ul>

	<h3><a id="cvstatus" name="cvstatus">ìÆpt@CÆ CVS \|WgÌär</a></h3>

	<p>\|WgÌÅVo[WÆ©ªÌìÆpRs[ª¯úµÄ¢é©ð©éà¤ 1 ÂÌû@ÍAÌR}hðgp·éû@Å·B</p>

	<p><code>cvstatus</code></p>

	<p>Ü½ÍAÂÊÌt@CEXe[^XðmF·éÉÍAÌR}hðgpµÜ·B</p>

	<p><code>cvs status filename</code></p>

	<p>±ÌärÉæèAÌ¤¿¢¸ê©ÌbZ[WªÔ³êÜ·B</p>

	<dl>
	<dt>Locally modified ([JÅC³ÏÝ)</dt>

	<dd>t@CðÒWµÜµ½ªAÏXªR~bg³êÄ¢Ü¹ñB</dd>

	<dt>Locally Added ([JÅÇÁÏÝ)</dt>

	<dd>t@CðÇÁµÜµ½ªAÏXªR~bg³êÄ¢Ü¹ñB</dd>

	<dt>Locally Removed ([JÅíÏÝ)</dt>

	<dd>uremovevðgÁÄt@CðíµÜµ½ªAÏXªR~bg³êÄ¢Ü¹ñB</dd>

	<dt>Needs Checkout (`FbNAEgªKv) </dt>

	<dd>Ù©Ì[UªVµ¢rWð\|WgÉR~bgµÄ¢Ü·B±ÌbZ[WÍìð³mÉ\µÄ¢È¢©àµêÜ¹ñBÊíAVµ¢rWðæ¾·éêÉÍu`FbNAEgvÅÍÈuXVvÆ¢¤pêðgpµÜ·B</dd>

	<dt>Needs Patch (pb`ªKv)</dt>

	<dd>u`FbNAEgªKvuÆ¯¶ACVS T[oªt@CSÌÅÍÈpb`ðMµÜ·Bpb`Ü½Ít@CSÌðM·é±ÆÍ¯¶ÊÆÈèÜ·B</dd>

	<dt>Needs Merge (}[WªKv) </dt>

	<dd>Ù©Ì[UªæèVµ¢rWð\|WgÉR~bgµÜµ½B³çÉA©ªàt@CÉÏXðÁ¦Ä¢Ü·B </dd>

	<dt>File had conflicts on merge (t@CÉ}[WãÌ£ª èÜ·B) </dt>

	<dd>±êÍAu[JÅC³ÏÝvÆ¯¶Å·ªAOÌuupdatevR}hðÀs·éÆ£ª¶µÄACVS ªÁ¦½ÏXððÅ«Ü¹ñB
	Ü¸A<a href="#cvsresolving">RtNgÌð</a>ðÀsµÈ¯êÎÈèÜ¹ñB</dd>

	<dt>s¾</dt>

	<dd>CVS Í±Ìt@CÉÖµÄîñðÁÄ¢Ü¹ñB ½Æ¦ÎAVµ¢t@Cðì¬µ½ªAucvs addvðÜ¾ÀsµÄ¢È¢æ¤ÈêÉ¶µÜ·B</dd>
	</dl>

	<p>êÊIÉA<I>t@CÌÏXðR~bg·é¼OÉ</I>A\|WgÆìÆpt@Cª¯úµÄ¢é©ðmF·é±Æð¨©ßµÜ·B±êÍAÙÈéfBNg©çR~bgµ½èA©ªª\|Wg©ç`FbNAEgµ½èÅãÉXVµ½ãÅAÙ©ÌJÒª¯¶t@CÉÏXðÁ¦½êÈÇÌRÅAR~bgª³µÀsÅ«È¢±Æª é½ßÅ·B¯¶t@CÌÃ¢o[WÉÎµAÏXðR~bgµæ¤Æ·éÆACVS ª±êçð}[W·éÆ«É£ª¶µâ·ÈèÜ·B±Ìæ¤ÈóÔÅR~bgµæ¤Æ·éÆACVS ©çudying gaspsvÌbZ[Wª\¦³êé±Æª èÜ·B </p>

	<p>t@CÌRs[Æ\|WgÌÅVo[WÆÌ·ð\¦·éÉÍAÌR}hðüÍµÜ·B</p>

	<p><code>cvs diff filename</code></p>

	<p><a href="http://cvsbook.red-bean.com/cvsbook.html#Finding_Out_What_You__And_Others__Did_--_update_And_diff">vWFNg\|WgÆ©ªÌìÆÉÂ¢ÄÌÚ×</a></p>

	<h3><a id="otherdiff" name="otherdiff">·ðR~bg·é<i>OÉ</i>At@CÌo[Wðär·é</a></h3>

	<p>©ªÌÏXðR~bg·é<i>OÉ</i>A¯¶t@CÉÙ©ÌJÒªÁ¦½ÏXð\¦µ½¢êª èÜ·B
	½Æ¦ÎAñíÉ¡GÈÏXðR~bgµæ¤ÆµÄ¢éêÅAÙ©ÌJÒÌìÆÆ£ª\z³êéæ¤ÈêÅ·B</p>

	<p>±ÌêÍAÊÌt@C¼Å©ªÌìÆpt@CðÛ¶µÄ¨«Ü· (u filename-newvÈÇjB »ê©çA<b>cvs update</b>R}hðÀsµÄA\|WgÌÅVo[WÆ©ªÌt@CðÏXðR~bg·éOÉärµÜ·B Ì diff R}hðgÁÄA2 ÂÌt@Cð¡ÉÀ×Äär·é±ÆàÅ«Ü·B</p>

	<p><code>diff -y filename filename-new</code></p>

	<h3><a id="cvsmerging" name="cvsmerging">Ù©ÌJÒÌÏXÉ©ªÌÏXð}[W·é</a></h3>

	<p><b>ucvs updatev</b> R}hðÀs·é±ÆÍACVS É\|WgÌÅVo[Wð©ªÌìÆpRs[É}[W·é±ÆÆ¯¶Å·B</p>

	<p>µ©µAÅãÉXVµÄ©çt@CÉÁ¦çê½ÏXªA©ªÌÏXÆíÈ¢êª èÜ·BÜ½ÍA\|WgÌo[WàÅ£·éÏXð©ªªÁ¦½æ¤Èêà èÜ·B CVS ÍAXVµÄR~bg·éÛÉA±Ìæ¤È£ðÅ«é¾¯©®IÉðµæ¤ÆÝÜ·ªA·×ÄððÅ«È¢êª èÜ·B±ÌêAt@CàÌ£ÍAèìÆÅðµÈ¯êÎÈèÜ¹ñB</p>

	<h3><a id="cvsresolving" name="cvsresolving">}[W·éÛÌRtNgÌðÁ</a></h3>

	<p>}[WERtNgðð·éÉÍAt@CEGfB^Åt@CðJ«Ü·B<b>>>>>>></b> and <b><<<<<<<<</b>Å}[N³êÄ¢ésâZNVðTµÜ·B CVS ªRtNgððÅ«È¢êÍA¼o[WÉe¿·ésâZNVðt@CÉÜßÜ·BÅVÌo[WªÊíæÉ}ü³êÜ·BRtNgððÁ·éìÆÍAsKvÈsÆRtNgÌLârWÔÈÇðÜÞsðí·é±ÆÅ·B
	»ê©çAt@CðÛ¶µÄÄxR~bgµÜ·B</p>

	<ul>
	<li><a href="http://www.gnu.org/manual/cvs/html_chapter/cvs_7.html#SEC40">RtNgÌá</a></li>

	<li><a href="http://cvsbook.red-bean.com/cvsbook.html#Detecting_And_Resolving_Conflicts">RtNgÌðÉÂ¢ÄÌÚ×</a></li>
	</ul>

	<h3><a id="reverting" name="reverting">rWðÆ</a></h3>

	<p><b>cvs log</b>R}hðgÁÄt@CÌÏXðð\¦·é±ÆÈOÉA<i></i>vZXðgÁÄÈOÌt@CErWðÅVÌo[WÆµÄÀÛÉ³¹é±ÆªÅ«Ü·(u\|WgÌwbhvÉ³³êÜ·)B ±êÍA¢©ÈéRª éÆµÄàAt@CðÈOÌo[WÉß·Kvª éêÉÖÅ·BJvWFNgÉóê½rhâÙ©Ìâèª éêÍA±êÍÅàÖÅÍÈo[WÇ@\ÉÈèÜ·B</p>

	<p>>Ó: urWvÆuo[WvÌá¢ð¬¯·é±Æª èÜ·B <i>rW</i>ÍAÂXÌt@CÌÁèÌAbvf[gÅArWÔÍ 1.1A1.2A1.3 ÈÇÆÈèÜ·B ucvs log filenamevR}hðÀs·éÆAÁèÌt@CÌrWÔª·×Ä\¦³êÜ·BêûA<i>o[W</i>ÍAt@CErWÌ<b><i>Zbg</i></b>ÅAÁèÌ_Å^Ot¯³ê¼Oªt¯çêÜ·Bo[WÍt@CÌrWÆ¯lÉ¼Oªt¯çêé½ßA¬¯µâ·ÈÁÄ¢Ü· (1.0A1.1A1.2 ÈÇ)Bµ©µAo[WÍ±Ìû@Å¼Oðt¯éKvÍ èÜ¹ñBvWFNgI[iªwèµ½CÓÌ¶ñâAÙÈéÔXL[ðgpÅ«Ü·B</p>

	<p>Ü¸Aðs¤OÉA»ÝÌ\|WgEwbhÉ ét@CEo[WÆµæ¤ÆµÄ¢éo[WÔÌ·ðmF·é±Æð¨©ßµÜ·B±êÉÍAÌR}hðgpµÜ·B</p>

	<p><code>cvs diff -c -r version# -r version# filename</code></p>

	<p>±êÉæèAµæ¤Æ·éOÉA2 ÂÌt@CðärÅ«Ü·B 2 ÂÌo[WðæÊÅ«éÀèA±ÌR}hÌÊÍv½IÈàÌÉÍÈèÜ¹ñB</p>

	<p>Égp·éR}hÉÍAo[WÔÌ[Éµµ]¤±ÆªKvÅ·BÅVÌo[W©çÈOÌo[WÉ·éÉÍAÌR}hðüÍµÜ·B</p>

	<p><code>cvs update -j later_version# -j earlier_version# filename</code></p>

	<p>ÉÍA¡Ìû@ª é½ßAÌÚàQÆµÄ¾³¢:<br />
	<a href="http://cvsbook.red-bean.com/cvsbook.html#Examining_And_Reverting_Changes">ÉÂ¢ÄÌÚ×</a><br />
	<a href="http://www.gnu.org/manual/cvs/html_chapter/cvs_16.html#SEC72">rWðÉÂ¢ÄÌÚ×</a></p>

	<p>ÍAuXeBbL[E^OvG[ðµêª éÆ¢¤±ÆÉàÓµÄ¾³¢B±êÍAÌXVR}hÉÁÊÈXCb`ðgÁÄðÅ«Ü·B</p>

	<p><code>cvs update -dAP</code></p>

	<p>(<a href="http://cvsbook.red-bean.com/cvsbook.html#Getting_Snapshots__Dates_And_Tagging_">XeBbL\|^OG[ÆÍ?</a>)</p>
	<!--

	<h3><a name="cvstips">Feedback on this document</a></h3>
	<p>
	The author of this help document has made every attempt to compile accurate, helpful information about using CVS for projects hosted on this site. If you think any content in the above document is wrong, inadequate, or something is just plain missing ... that's good. This is open source, so step up to the plate and contribute your suggestions for additions and improvements.
	</p> -->

	<p>æèÚµ¢ CVS Ìwv: <a href="/nonav/docs/ddCVS_cvsmanaging.html">R}hC CVS ðgÁ½vWFNgt@CÆfBNgÌÇ</a></p>

	<div class="courtesylinks">
	<p><a href="#toc">gbv</a> \| <a href="/nonav/servlets/HelpTOC">wvõø</a></p>
	</div>
	</div>
	</body>
	</html>