Next: Conflicts example, Previous: File status, Up: Multiple developers [Contents][Index]
¥Õ¥¡¥¤¥ë¤ò¹¹¿·¤â¤·¤¯¤Ï¥Þ¡¼¥¸¤·¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢
update
¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Þ¤¹¡£
¤³¤ì¤ÏºÇ¿·¤Ç¤Ê¤¤¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¤Ï checkout
¥³¥Þ¥ó¥É¤È¤Û¤È¤ó¤É
Åù²Á¤Ç¤¹¡£
¤Ä¤Þ¤ê¡¢¥Õ¥¡¥¤¥ë¤ÎºÇ¿·¥ê¥Ó¥¸¥ç¥ó¤ò¥ê¥Ý¥¸¥È¥ê¤«¤é¼è¤ê½Ð¤·¤Æ¡¢
ºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤¤Þ¤¹¡£
update
¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¤â¡¢
¤¢¤Ê¤¿¤Î½¤Àµ¤¬¼º¤Ê¤ï¤ì¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£
¤è¤ê¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤¬Ìµ¤¤¾ì¹ç¤Ë¤Ï¡¢update
¤Ï²¿¤â¤·¤Þ¤»¤ó¡£
¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤¬Â¸ºß¤·¡¢¤«¤Äºî¶È¥Õ¥¡¥¤¥ë¤¬½¤Àµ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢
CVS ¤ÏÁ´¤Æ¤ÎÊѹ¹¤òºî¶È¥³¥Ô¡¼¤Ë¥Þ¡¼¥¸¤·¤Þ¤¹¡£
Î㤨¤Ð¥ê¥Ó¥¸¥ç¥ó 1.4 ¤ò¼è¤ê½Ð¤·¤Æ¡¢ÊÔ½¸¤ò»Ï¤á¤¿¤È¤·¤Þ¤¹¡£
¤½¤Î¹ç´Ö¤Ë¾¤Î¿Íʪ¤¬¥Ð¡¼¥¸¥ç¥ó 1.5 ¤ò³ÊǼ¤·¡¢
¤Þ¤¿¤¹¤°¤Ë 1.6 ¤Ë¤Ê¤Ã¤¿¤È¤·¤Þ¤¹¡£
¤³¤³¤Ç update
¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤¿¾ì¹ç¡¢
CVS ¤Ï 1.4 ¤È 1.6 ´Ö¤ÎÊѹ¹¤ò¡¢¤¢¤Ê¤¿¤Î¥Õ¥¡¥¤¥ë¤ËÁÈ¤ßÆþ¤ì¤Þ¤¹¡£
1.4 ¤È 1.6 ´Ö¤ÎÊѹ¹¤¬¡¢¤¢¤Ê¤¿¤ÎÊѹ¹¤È»÷¤¿¤è¤¦¤Ê¤â¤Î¤Ç¤¢¤ì¤Ð¡¢
½ÅÊ£ (overlap) ¤¬µ¯¤¤Þ¤¹¡£
¤½¤·¤Æ·Ù¹ð¤¬É½¼¨¤µ¤ì¡¢¥Õ¥¡¥¤¥ë¤Ë¤Ï½ÅÊ£¤·¤¿¹Ô¤¬Î¾Êýʵ¤µ¤ì¤Æ¡¢
ÆÃÊ̤ʥޡ¼¥¯¤Ç°Ï¤Þ¤ì¤Þ¤¹¡£
update
¥³¥Þ¥ó¥É¤Î¾ÜºÙ¤Ï See update.