Next: , Up: Multiple developers   [Contents][Index]


10.1 ¥Õ¥¡¥¤¥ë¾õÂÖ

¼è¤ê½Ð¤·¤¿¸å¤Ë¤¢¤Ê¤¿¤¬²Ã¤¨¤¿Áàºî¤ä¡¢ ¾¤Î¿Íʪ¤¬¥ê¥Ý¥¸¥È¥ê¤Ë²Ã¤¨¤¿Áàºî¤Ë¤è¤Ã¤Æ¡¢ ¥Õ¥¡¥¤¥ë¤ò´ö¤Ä¤«¤Î¾õÂÖ¤ËʬÎष¤Þ¤¹¡£ status ¥³¥Þ¥ó¥É¤Ë¤è¤Ã¤ÆÊó¹ð¤µ¤ì¤ë¾õÂÖ¤ò°Ê²¼¤Ëµó¤²¤Þ¤¹:

Up-to-date

¤³¤Î¥Õ¥¡¥¤¥ë¤¬¡¢ »ÈÍѤ·¤Æ¤¤¤ë»Þ¤ÎºÇ¿·¥ê¥Ó¥¸¥ç¥ó¤ÈƱ¤¸¤Ç¤¢¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£

Locally Modified

¤³¤Î¥Õ¥¡¥¤¥ë¤ò½¤Àµ¤·¤¿¤¬¡¢¤Þ¤ÀÊѹ¹ÆâÍÆ¤ò³ÊǼ¤·¤Æ¤Ê¤¤¤³¤È¤ò¼¨¤·¤Þ¤¹¡£

Locally Added

add ¥³¥Þ¥ó¥É¤Ë¤è¤ê¥Õ¥¡¥¤¥ë¤ò²Ã¤¨¤¿¤¬¡¢ ¤Þ¤À¤½¤ÎÆâÍÆ¤ò³ÊǼ¤·¤Æ¤Ê¤¤¤³¤È¤ò¼¨¤·¤Þ¤¹¡£

Locally Removed

remove ¥³¥Þ¥ó¥É¤Ë¤è¤ê¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤¿¤¬¡¢ ¤Þ¤À¤½¤ÎÊѹ¹¤ò³ÊǼ¤·¤Æ¤Ê¤¤¤³¤È¤ò¼¨¤·¤Þ¤¹¡£

Needs Checkout

¾¤Î¿Íʪ¤¬¿·¤·¤¤¥ê¥Ó¥¸¥ç¥ó¤ò¥ê¥Ý¥¸¥È¥ê¤Ë³ÊǼ¤·¤¿¤³¤È¤ò¼¨¤·¤Þ¤¹¡£ ¤³¤Îɽ¼¨¤Ï¾¯¤·Ê¶¤é¤ï¤·¤¤¤Î¤Ç¤¹¤¬¡¢ ¿·¤·¤¤¥ê¥Ó¥¸¥ç¥ó¤ò¼è¤ê½Ð¤¹ºÝ¤Ë¤Ï¡¢checkout ¤Ç¤Ï¤Ê¤¯¡¢ update ¤ò»ÈÍѤ¹¤ë¤Î¤¬ÉáÄ̤Ǥ¹¡£

Needs Patch

Needs Checkout ¤È»÷¤¿¤è¤¦¤Ê¤â¤Î¤Ç¤¹¤¬¡¢ CVS ¤Î¥µ¡¼¥Ð¤Ï¡¢¥Õ¥¡¥¤¥ëÁ´¤Æ¤Ç¤Ï¤Ê¤¯º¹Ê¬¤òÁ÷¤ê¤Þ¤¹¡£ º¹Ê¬¤òÁ÷¤ë¾ì¹ç¤â¡¢¥Õ¥¡¥¤¥ëÁ´¤Æ¤òÁ÷¤ë¾ì¹ç¤È·ë²Ì¤ÏƱ¤¸¤Ç¤¹¡£

Needs Merge

¾¤Î¿Íʪ¤¬¿·¤·¤¤¥ê¥Ó¥¸¥ç¥ó¤ò¥ê¥Ý¥¸¥È¥ê¤Ë³ÊǼ¤·¤¿¤¬¡¢ ºî¶È¥Õ¥¡¥¤¥ë¤â½¤Àµ¤µ¤ì¤Æ¤¤¤¿¤¿¤á¡¢¥Þ¡¼¥¸¤¹¤ëɬÍפ¬¤¢¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£

File had conflicts on merge

Locally Modified ¤È»÷¤Æ¤¤¤Þ¤¹¤¬¡¢Àè¤Î update ¥³¥Þ¥ó¥É¤Î·ë²Ì¡¢ Êѹ¹ÅÀ¤Î¾×ÆÍ¤¬È¯¸«¤µ¤ì¤¿¤³¤È¤ò¼¨¤·¤Þ¤¹¡£ ¾×ÆÍ¤ò²ò¾Ã¤¹¤ëÊýË¡¤Ï Conflicts example »²¾È¡£

Unknown

¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤Æ CVS ¤¬²¿¤âÃΤé¤Ê¤¤¤³¤È¤ò¼¨¤·¤Þ¤¹¡£ Î㤨¤Ð¿·¤¿¤Ê¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤¿¤¬¡¢add ¤ò¼Â¹Ô¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ê¤É¤Ç¤¹¡£

status ¤Ï¡¢¥Õ¥¡¥¤¥ë¾õÂÖ¤òʬÎह¤ëºÝ¤ÎÊä½õ¤È¤·¤Æ¡¢ ºî¶ÈÃæ¤Î¥Õ¥¡¥¤¥ë¤ÎͳÍè¤È¤Ê¤ë¥ê¥Ó¥¸¥ç¥ó ¤ò¼¨¤¹ ‘Working revision’ ¤È¡¢ »ÈÍÑÃæ¤Î»Þ¤Î¥ê¥Ý¥¸¥È¥ê¤Ë¤ª¤±¤ëºÇ¿·¥ê¥Ó¥¸¥ç¥ó ¤ò¼¨¤¹ ‘Repository revision’ ¤È¤âÊó¹ð¤·¤Þ¤¹¡£

status ¥³¥Þ¥ó¥É¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤Ï¡¢Invoking CVS »²¾È¡£ ‘Sticky tag’ ¤È ‘Sticky date’ ¤Ë¤Ä¤¤¤Æ¤Î ¾ðÊó¤Ï¡¢Sticky tags »²¾È¡£ ‘Sticky options’ ¤Î¾ðÊó¤Ï¡¢update options ¤Î ‘-k’ ¥ª¥×¥·¥ç¥ó¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£

status ¤È update ¥³¥Þ¥ó¥É¤ÏÊä´°¤¹¤ë¤è¤¦¤Ê¤â¤Î¤È¤·¤Æ¹Í¤¨ ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥Õ¥¡¥¤¥ë¤òºÇ¿·¤Ë¤¹¤ë¤¿¤á¤Ë¤Ï update ¤ò»È¤¤¡¢ status ¤Ç update ¤¬²¿¤ò¤¹¤ë¤«¤ò¤¢¤ëÄøÅÙÃΤ뤳¤È¤¬¤Ç¤­¤Þ ¤¹ (¤â¤Á¤í¤ó¡¢¥ê¥Ý¥¸¥È¥ê¤Î¾õÂÖ¤Ï¼ÂºÝ¤Ë update ¤ò¼Â¹Ô¤¹¤ë¤Þ¤Ç¤Ë ÊѲ½¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó)¡£¼ÂºÝ¤Ï¡¢status ¥³¥Þ¥ó¥É¤Çɽ¼¨¤µ¤ì¤ë¤è ¤êû¤¤·Á¼°¤Ç¥³¥Þ¥ó¥É¤Ëɽ¼¨¤µ¤»¤¿¤±¤ì¤Ð¡¢¼¡¤ò¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹

$ cvs -n -q update

-n’ ¥ª¥×¥·¥ç¥ó¤Ï¼ÂºÝ¤Ë update ¤ò¤·¤Ê¤¤¤¬¡¢¾õÂÖ¤òɽ¼¨¤¹¤ë¤À¤±¤Ç¤¢ ¤ë¡¢¤È¤¤¤¦¤³¤È¤Ç¤¹¡£‘-q’ ¥ª¥×¥·¥ç¥ó¤Ï¤½¤ì¤¾¤ì¤Î¥Ç¥£¥ì¥¯¥È¥ê̾¤Î°õ »ú¤òÈò¤±¤Þ¤¹¡£update ¥³¥Þ¥ó¥É¤È¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Î¾ðÊó¤Ï¡¢ Invoking CVS ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£