Next: , Up: Binary files   [Contents][Index]


9.1 ¥Ð¥¤¥Ê¥ê¡¦¥Õ¥¡¥¤¥ë¤ÎÌäÂê

ÉáÃʺî¶È¤¹¤ë¥Õ¥¡¥¤¥ë¤¬¥Ð¥¤¥Ê¥ê¤Ç¤¢¤ì¤Ð¡¢¥Ð¥¤¥Ê¥ê¡¦¥Õ¥¡¥¤¥ë¤ò´ÉÍý¤¹¤ëɬ ÍפÏÌÀ¤é¤«¤Ç¤¹¤¬¡¢¤½¤ì¤ò¥Ð¡¼¥¸¥ç¥ó´ÉÍý¤ËÆþ¤ì¤ë¤³¤È¤ÏÄɲäÎÌäÂê¤òȯÀ¸¤µ ¤»¤Þ¤¹¡£

¥Ð¡¼¥¸¥ç¥ó´ÉÍý¤Î´ðËܵ¡Ç½¤Î°ì¤Ä¤Ï2¤Ä¤Î¥ê¥Ó¥¸¥ç¥ó¤Î°ã¤¤¤ò¼¨¤¹¤³¤È¤Ç¤¹¡£ Î㤨¤Ð¡¢Ê̤Î狼¤¬¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¥Õ¥¡¥¤¥ë¤ò³ÊǼ¤¹¤ì¤Ð¡¢²¿¤òÊѹ¹¤·¤Æ ¤¤¤Æ¡¢Êѹ¹¤¬Îɤ¤¤«¤É¤¦¤«¤ò·èÄꤷ¤¿¤¤¤È»×¤¦¤«¤â¤·¤ì¤Þ¤»¤ó¡£¥Æ¥­¥¹¥È¡¦¥Õ¥¡ ¥¤¥ë¤Ë¤Ï¡¢CVS ¤Ï cvs diff ¥³¥Þ¥ó¥É¤Ç¤³¤Îµ¡Ç½¤òÄ󶡤·¤Þ¤¹¡£ ¥Ð¥¤¥Ê¥ê¡¦¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢2¤Ä¤Î¥ê¥Ó¥¸¥ç¥ó¤ò¼è¤ê½Ð¤·¤Æ¡¢CVS ¤Î³°Éô¤Ë ¤¢¤ë¥×¥í¥°¥é¥à¤ÇÈæ³Ó¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤Ç¤·¤ç¤¦ (Î㤨¤Ð¡¢¥ï¡¼¥×¥í¤Ë¤Ï¤è¤¯ ¤½¤Î¤è¤¦¤Êµ¡Ç½¤¬¤¢¤ê¤Þ¤¹)¡£¤â¤·¤½¤Î¤è¤¦¤Ê¥Ä¡¼¥ë¤¬¤Ê¤±¤ì¤Ð¡¢¿Í¤ËÎɤ¤¥í ¥°¥á¥Ã¥»¡¼¥¸¤ò½ñ¤¯¤³¤È¤ò¶¯À©¤¹¤ë¤Ê¤É¤Î¾¤Îµ¡¹½¤òÄ̤¸¤ÆÊѹ¹¤òÄÉÀפ·¡¢¼Â ºÝ¤Ë¤·¤¿Êѹ¹¤¬ËÜÅö¤Ë¤½¤¦¤·¤¿¤¤¤È»×¤Ã¤Æ¤¤¤ëÊѹ¹¤½¤Î¤â¤Î¤Ç¤¢¤ë¤³¤È¤ò´üÂÔ ¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£

¥Ð¡¼¥¸¥ç¥ó´ÉÍý¥·¥¹¥Æ¥à¤Î¾¤Îµ¡Ç½¤Ï2¤Ä¤Î¥ê¥Ó¥¸¥ç¥ó¤ò¥Þ¡¼¥¸¤¹¤ëµ¡Ç½¤Ç¤¹¡£ CVS ¤Ç¤Ï¤³¤ì¤Ï2¤Ä¤Îʸ̮¤ÇȯÀ¸¤·¤Þ¤¹¡£1¤Ä¤á¤Ï»ÈÍѼԤ¬Ê¬Î¥¤µ¤ì¤¿ºî ¶È¥Ç¥£¥ì¥¯¥È¥ê¤ÇÊѹ¹¤ò¤·¤¿¤È¤­¤Ç¤¹ (see Multiple developers)¡£2¤Ä ÌÜ¤Ï ‘update -j’ ¥³¥Þ¥ó¥É¤ÇÌÀ¼¨Åª¤Ë¥Þ¡¼¥¸¤·¤¿¤È¤­¤Ç¤¹ (see Branching and merging)¡£

¥Æ¥­¥¹¥È¡¦¥Õ¥¡¥¤¥ë¤Î¾ì¹ç¤Ï¡¢CVS ¤ÏÆÈΩ¤Ë¤Ê¤µ¤ì¤¿Êѹ¹¤ò¥Þ¡¼¥¸¤Ç¤­¡¢ Êѹ¹¤¬¾×ÆÍ¤·¤¿¾ì¹ç¤Ï¾×ÆÍ¤òÊ󤻤뤳¤È¤¬¤Ç¤­¤Þ¤¹¡£¥Ð¥¤¥Ê¥ê¡¦¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢ CVS ¤Ë¤Ç¤­¤ë¤³¤È¤Ï¡¢¤»¤¤¤¼¤¤2¤Ä¤Î°ã¤Ã¤¿¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼¤ò½Ð¤·¤Æ¡¢ »ÈÍÑ¼Ô¤Ë¾×ÆÍ¤ò²ò¾Ã¤¹¤ë¤è¤¦¤Ë¤¹¤ë¤³¤È¤¯¤é¤¤¤Ç¤¹¡£»ÈÍѼԤϤɤÁ¤é¤«¤Î¥³¥Ô¡¼ ¤òÁª¤Ö¤«¤â¤·¤ì¤Þ¤»¤ó¤·¡¢ÆÃÄê¤Î¥Õ¥¡¥¤¥ë·Á¼°¤òÃΤäƤ¤¤ë³°Éô¥Þ¡¼¥¸¥Ä¡¼¥ë ¤¬¤¢¤ì¤Ð¤½¤ì¤ò¼Â¹Ô¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£»ÈÍѼԤ˥ޡ¼¥¸¤ò¤µ¤»¤ë¤³¤È¤Ï¡¢¼ç ¤Ë»ÈÍѼԤ¬¶öÁ³¤¤¤¯¤Ä¤«¤ÎÊѹ¹¤ò¾Êά¤·¤Æ¤·¤Þ¤ï¤Ê¤¤¡¢¤È¤¤¤¦¤³¤È¤Ë°Í¸¤·¤Æ ¤ª¤ê¡¢¥¨¥é¡¼¤¬È¯À¸¤¹¤ë²ÄǽÀ­¤¬¹â¤¤¤È¤¤¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£

¤³¤Î²áÄø¤¬Ë¾¤Þ¤·¤¯¤Ê¤¤¤Ê¤é¡¢ºÇÎɤÎÁªÂò¤Ï¥Þ¡¼¥¸¤òÈò¤±¤ë¤³¤È¤Ç¤·¤ç¤¦¡£ÊÌ ¤Îºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤è¤ë¥Þ¡¼¥¸¤òÈò¤±¤ë¤¿¤á¤Ë¤Ï¡¢Multiple developers ¤ÎÆÈÀê¼èÆÀ (¥Õ¥¡¥¤¥ëÀêÍ­) ¤ÎµÄÏÀ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£»Þ¤Ë¤è ¤ë¥Þ¡¼¥¸¤òÈò¤±¤ë¤¿¤á¤Ë¤Ï¡¢»Þ¤Î»ÈÍѤòÀ©¸Â¤·¤Æ¤¯¤À¤µ¤¤¡£