Next: A sample session, Previous: What is CVS?, Up: Overview [Contents][Index]
CVS ¤Ï¿¤¯¤Î¤³¤È¤¬¤Ç¤¤Þ¤¹¤¬¡¢Á´¤Æ¤Î¿Í¤ËÁ´¤Æ¤Î¤³¤È¤ò ¤¹¤ë¤è¤¦¤Ë¤Ï¤Ê¤Ã¤Æ¤¤¤Þ¤»¤ó¡£
¥ê¥Ý¥¸¥È¥ê¤È modules ¥Õ¥¡¥¤¥ë¤Î¹½Â¤¤È¹½ÃÛ¥·¥¹¥Æ¥à (Îã. Makefile) ¤È¤ÏÁê¸ßºîÍѤ¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¤¬¡¢ËܼÁŪ ¤ËÆÈΩ¤·¤¿¤â¤Î¤Ç¤¹¡£
CVS ¤Ï¡¢²¿¤«¤Îºî¤êÊý¤ò»Ø¼¨¤·¤¿¤ê¤Ï¤·¤Þ¤»¤ó¡£ CVS ¤Ï¤¢¤Ê¤¿¤Î°Õ»×¤Ë½¾¤Ã¤Æ¡¢ ¥Ä¥ê¡¼¹½Â¤¤«¤é˾¤à¥Õ¥¡¥¤¥ë¤ò¼è¤ê½Ð¤¹¤À¤±¤Ç¤¹¡£
CVS ¤Ï¡¢checkout
Àè¤Îºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤λÈÍÑ
Ë¡¤Ë¤Ä¤¤¤Æ»Ø¼¨¤·¤¿¤ê¤Ï¤·¤Þ¤»¤ó¡£¤¢¤Ê¤¿¤¬ Makefile ¤ä¥¹¥¯¥ê¥×¥È¤ò
Á´¤Æ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç½ñ¤¡¢¤½¤ì¤é¤¬³Æ¡¹Á´¤Æ¤ÎÁêÂÐŪ¤Ê°ÌÃÖ¤òÃΤëɬÍפ¬¤¢
¤ë¤È¤¹¤ë¤È¡¢¥ê¥Ý¥¸¥È¥êÁ´¤Æ¤ò¼è¤ê½Ð¤¹É¬Íפ¬À¸¤¸¤Þ¤¹¡£
¤¢¤Ê¤¿¤¬»Å»ö¤ò¥â¥¸¥å¡¼¥ë²½¤·¡¢(Makefile ¤Ë link,
mount, VPATH
Åù¤ò»ÈÍѤ·¤Æ¡¢)¥Õ¥¡¥¤¥ë¤ò¶¦Í¤¹¤ë¤è
¤¦¤Ê¹½ÃÛ¥·¥¹¥Æ¥à¤ò¹½À®¤¹¤ì¤Ð¡¢¹¥¤¤ÊÍͤ˥ǥ£¥¹¥¯¤ÎÍøÍÑ
Ë¡¤ò·è¤á¤ë¤³¤È¤¬½ÐÍè¤Þ¤¹¡£
¤·¤«¤·¤³¤ì¤éÁ´¤Æ¤Î¥·¥¹¥Æ¥à¤Ï¡¢ ¹½ÃۤȰݻý¤Ë¿Âç¤ÊÏ«ÎϤ¬É¬Íפʤ³¤È¤Ë¡¢ µ¤¤òÉÕ¤±¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó¡£ CVS ¤Ï¡¢¤³¤Î¤è¤¦¤ÊÌäÂê¤Ë´Ø¤·¤Æ¹Íθ¤·¤Þ¤»¤ó¡£
¤â¤Á¤í¤ó¡¢¤³¤ì¤é¤Î¹½ÃÛ¥·¥¹¥Æ¥à¤ò»Ù±ç¤¹¤ë¤¿¤á¤ÎÆ»¶ñ (¥¹¥¯¥ê¥×¥È, Makefile Åù) ¤Ï¡¢ CVS ¤Î´ÉÍý²¼¤ËÃÖ¤¯¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£
²¿¤é¤«¤ÎÊѹ¹¤¬¤¢¤Ã¤¿ºÝ¤Ë¡¢ºÆ¹½ÃÛ¤¬É¬Íפʥե¡¥¤¥ë¤òÄ´¤Ù¤ë¤Î¤Ï¡¢
¤ä¤Ï¤ê CVS ¤Î¼éÈ÷³°¤Ç¤¹¡£
ÅÁÅýŪ¤Ê¼êË¡¤Î°ìÎã¤ò¤¢¤²¤ë¤È¡¢
¹½ÃÛ¤Ë¤Ï make
¤òÍѤ¤¡¢
make
¤ËɬÍפʰ͸´Ø·¸¤Ï¼«Æ°²½¤µ¤ì¤¿¥Ä¡¼¥ë¤òÍѤ¤¤ÆÀ¸À®¤·¤Þ¤¹¡£
CVS ¤È·ë¹ç¤·¤Æ¹½ÃÛ¤ò¹Ô¤¦¤¿¤á¤Î¾ðÊó¤Ï Builds ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
¤¢¤Ê¤¿¤Î´ÉÍý¼Ô¤ä¾å»Ê¤Ï¡¢´üÆü¤Ë½¾¤Ã¤Æ¤¤¤ë¤«¤É¤¦¤«¤ä¡¢ ¥Þ¡¼¥¸ÅÀ¡¢»Þ¤Î̾Á°¡¢¥ê¥ê¡¼¥¹¤ÎÆü»þÅù¤Ë¤Ä¤¤¤Æ¡¢ ¤¢¤Ê¤¿¤ÈÅÙ¡¹Ïä·¤¢¤¦¤³¤È¤òµá¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£ ÈàÅù¤¬¤½¤¦¤·¤Ê¤¤¤Ê¤é¡¢CVS ¤ÏÌò¤ËΩ¤Á¤Þ¤»¤ó¡£
CVS ¤Ï¡¢¤¢¤Ê¤¿¤ÎĴΧ¤Ë½¾¤Ã¤Æ¥½¡¼¥¹¤òÍ٤餻¤ë³Ú´ï¤Î ¤è¤¦¤Ê¤â¤Î¤Ç¤¹¡£¤¢¤Ê¤¿¤Ï³Ú´ïÁռԤ⤷¤¯¤Ïºî¶Ê¼Ô¤Î¤è¤¦¤Ê ¤â¤Î¤Ç¤¹¡£¤É¤ó¤Ê³Ú´ï¤â¾¡¼ê¤Ë±éÁÕ¤ò¤·¤¿¤ê¤·¤Ê¤¤¤·¡¢²»³Ú ¤¬¾¡¼ê¤Ë½ñ¤«¤ì¤¿¤ê¤â¤·¤Þ¤»¤ó¡£
¤¢¤ë¥Õ¥¡¥¤¥ë¤Ë¾×ÆÍ¤¬µ¯¤¤¿¾ì¹ç¤Ë¡¢ ¤Û¤È¤ó¤É¤Î³«È¯¼Ô¤Ï¤½¤ì¤Û¤É¶ìÏ«¤»¤º¤Ë²ò·è¤·¤Þ¤¹¡£ ¤·¤«¤·¡¢¾×ÆÍ (conflict)¤Î¤è¤ê°ìÈÌŪ¤ÊÄêµÁ¤Ë¤Ï¡¢ ³«È¯¼ÔƱ»Î¤Î°Õ»ÖÁÂÄ̤ʤ·¤Ë¤Ï²ò·è¤Ç¤¤Ê¤¤ º¤Æñ¤ÊÌäÂê¤â´Þ¤Þ¤ì¤Þ¤¹¡£
Ʊ¤¸¥Õ¥¡¥¤¥ë (¤â¤·¤¯¤Ï¥Õ¥¡¥¤¥ë¤Î½¸¹ç) ¤Ë¡¢
Ʊ»þ¤Ë²Ã¤¨¤é¤ì¤¿Êѹ¹¤ËÏÀÍýŪ¤Ê¾×ÆÍ¤¬¤¢¤Ã¤Æ¤â¡¢
CVS ¤Ë¤Ïʬ¤ê¤Þ¤»¤ó¡£
¾×ÆÍ¤È¤¤¤¦³µÇ°¤Ïñ¤Ëʸ»úÎó¤ÎÈæ³Ó¤Ë¤è¤ë¤â¤Î¤Ç¡¢
Ʊ¤¸¥Õ¥¡¥¤¥ë¤ò´ð¤Ë²Ã¤¨¤é¤ì¤¿Æó¤Ä¤ÎÊѹ¹¤¬¡¢
merge
¥³¥Þ¥ó¥É (¤Ä¤Þ¤ê diff3
) ¤ò¶Ã¤«¤»¤ë¤Î¤Ë
½½Ê¬¤Ê¤Û¤É¶áÀܤ·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Î¤ßÀ¸¤¸¤Þ¤¹¡£
CVS ¤Ï¡¢ ¥×¥í¥°¥é¥à¤ÎÏÀÍý¤Ë¡¢Ê¸»úÎó¤Ç¤Ê¤¤¾×ÆÍ¤ä¡¢»¶¤é¤Ð¤Ã¤¿¾×ÆÍ ¤¬¤¢¤Ã¤¿¤È¤·¤Æ¤â¡¢·Ù¹ð¤òɽ¼¨¤·¤Þ¤»¤ó¡£
Îã:
¤¢¤Ê¤¿¤Ï A ¤ÇÄêµÁ¤µ¤ì¤¿´Ø¿ô X
¤Î°ú¿ô¤òÊѹ¹¤·¤¿¤È¤·¤Þ¤¹¡£
Ʊ¤¸»þ¤Ë¡¢Ã¯¤«¤¬ B ¤òÊÔ½¸¤·¤Æ¡¢
¸Å¤¤°ú¿ô¤ò»È¤Ã¤Æ X
¤ò¸Æ¤Ó½Ð¤·¤¿¤È¤·¤Þ¤¹¡£
¤³¤ì¤Ï CVS ¤ÎǽÎϤÎÈϰϳ°¤Ç¤¹¡£
»ÅÍͽñ¤òÆÉ¤ß¡¢Æ±Î½¤ÈÏ䷹礦½¬´·¤òÉÕ¤±¤Þ¤·¤ç¤¦¡£
Êѹ¹´ÉÍý¤È¤¤¤¦¸ÀÍÕ¤ÏÍÍ¡¹¤Ê°ÕÌ£¤ò»ý¤Á¤Þ¤¹¡£ ¤Þ¤º¥Ð¥°ÄÉÀפȲò¼á¤¹¤ì¤Ð¡¢¥Ð¥°Êó¹ð¤È³Æ¥Ð¥°¤Î¾õÂÖ (½¤Àµ¤µ¤ì¤¿¤«? ¤É¤Î¥ê¥ê¡¼¥¹¤«? Êó¹ð¼Ô¤Ï½¤Àµ¤ò³Îǧ¤·¤¿¤«? ) ¤Ë¤Ä¤¤¤Æ¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹´ÉÍý¤ò°ÕÌ£¤·¤Þ¤¹¡£ CVS ¤È¥Ð¥°ÄÉÀ×¥·¥¹¥Æ¥à¤È¤ÎÏ¢·È¤Ë¤Ä¤¤¤Æ¤Ï¡¢ rcsinfo ¤È editinfo ¥Õ¥¡¥¤¥ë¤ò¸«¤Æ²¼¤µ¤¤ (see Administrative files)¡£
ÏÀÍýŪ¤Ë¤Ï°ì¤Ä¤È¹Í¤¨¤é¤ì¤ëÊѹ¹¤Î¤¿¤á¡¢
Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤¬Æ±»þ¤ËÊѹ¹¤µ¤ì¤¿¤³¤È¤ò³Ð¤¨¤Æ¤ª¤¯¤³¤È¤â¡¢
Êѹ¹´ÉÍý¤È¸Æ¤Ð¤ì¤Þ¤¹¡£
Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤ÎÊѹ¹¤ò°ì¤Ä¤Î cvs commit
¤Ë¤è¤ê³ÊǼ¤·¤¿¾ì¹ç¡¢
CVS ¤Ï¤½¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤¬Æ±»þ¤Ë³ÊǼ¤µ¤ì¤¿¤³¤È¤ò˺¤ì¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
¤½¤·¤Æ¡¢¤½¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ò·ë¤Ö»öÊÁ¤Ï¡¢
Ʊ¤¸¥í¥°¡¦¥á¥Ã¥»¡¼¥¸¤ò»ý¤Ä¤³¤È¤À¤±¤Ë¤Ê¤ë¤Î¤Ç¤¹¡£
GNU ·Á¼°¤Î ChangeLog ¤òÍѤ¤¤ì¤Ð²¿¤é¤«¤Î½õ¤±¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£
³ÆÊѹ¹¤Î¾õÂÖ¤ò³Ð¤¨¤Æ¤ª¤¯Ç½ÎϤò¡¢Êѹ¹´ÉÍý¤È¸Æ¤Ö¥·¥¹¥Æ¥à¤â¤¢¤ê¤Þ¤¹¡£
³«È¯¼Ô¤Ë¤è¤Ã¤Æ²Ã¤¨¤é¤ì¤¿Êѹ¹¤â¤¢¤ì¤Ð¡¢
¾¤Î³«È¯¼Ô¤Ë¤è¤Ã¤ÆÄÉ»îÃæ¤ÎÊѹ¹¤â¤¢¤ë¤È¤«¡¢¤½¤¦¤¤¤Ã¤¿¤³¤È¤Ç¤¹¡£
°ìÈÌŪ¤Ë CVS ¤Ç¤³¤Î¤è¤¦¤Ê¤³¤È¤ò¤¹¤ë¤Ë¤Ï¡¢
(cvs diff
¤ä diff
¤òÍѤ¤¤Æ) º¹Ê¬¤òÀ¸À®¤·¡¢
patch
¤òÅö¤Æ¤ë¿Íʪ¤Ë¥á¡¼¥ë¤È¤·¤ÆÁ÷¤ê¤Þ¤¹¡£
¤³¤ì¤ÏÈó¾ï¤ËÍ»Ä̤Τ¤¯ÊýË¡¤Ç¤¹¤¬¡¢
CVS °Ê³°¤Îµ¡¹½¤Ë°Í¸¤·¤Æ¤¤¤ë¤Î¤Ç¡¢
ÌäÂ̵꤬¤¤¤³¤È¤òÊݾڤǤ¤Þ¤»¤ó¡£
commitinfo
¥Õ¥¡¥¤¥ë¤ò»È¤¨¤Ð¡¢
¶¯À©Åª¤Ëɬ¿Ü¤Î¹àÌܤò¸¡ºº¤¹¤ë¤³¤È¤Ï²Äǽ¤À¤È»×¤¤¤Þ¤¹¡£
¤·¤«¤·¡¢
¤½¤ó¤Ê¤³¤È¤ò¤·¤è¤¦¤È¤·¤¿¥×¥í¥¸¥§¥¯¥È¤Î¤³¤È¤Ïʹ¤¤¤¿¤³¤È¤¬¤¢¤ê¤Þ¤»¤ó¡£
Êѹ¹¤ä¥ê¥ê¡¼¥¹¤ËɬÍפȤµ¤ì¤ë¿§¡¹¤Ê¼ê½ç¤ä¿¤¯¤Î¾µÇ§¤ò¡¢ ³Î¼Â¤Ë¹Ô¤Ê¤¦ÊýË¡¤òÈ÷¤¨¤¿¥·¥¹¥Æ¥à¤â¤¢¤ê¤Þ¤¹¡£ CVS ¤òÍѤ¤¤Æ¤³¤ì¤òãÀ®¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¤¬¡¢ ¤Á¤ç¤Ã¤ÈÌÌÅݤÀ¤È»×¤¤¤Þ¤¹¡£ ¾ì¹ç¤Ë¤è¤Ã¤Æ¤Ï¡¢ commitinfo, loginfo, rcsinfo, verifymsg Åù¤Î¥Õ¥¡¥¤¥ë¤òÍѤ¤¤Æ¡¢Êѹ¹ÅÀ¤ò³ÊǼ¤¹¤ëÁ°¤Ë¡¢ ɬÍפʼê½ç¤ò³Î¼Â¤ËƧ¤à¤è¤¦¤ËÀßÄê¤Ç¤¤ë¤Ç¤·¤ç¤¦¡£ ¤Þ¤¿»Þ¤ä¥¿¥°¤È¤¤¤Ã¤¿µ¡¹½¤òÍѤ¤¤Æ¡¢ ³«È¯ÍѤλޤǻŻö¤ò¼Â¹Ô¤·¡¢ °ÂÄêÀ¤¬¾ÚÌÀ¤µ¤ì¤¿³Î¼Â¤ÊÊѹ¹¤À¤±¤ò °ÂÄê²½»Ø¸þ¤Î»Þ¤ËÅý¹ç¤¹¤ë¤³¤È¤â¹Í¤¨¤é¤ì¤Þ¤¹¡£