Previous: update options, Up: update   [Contents][Index]


A.16.2 update ¤Î½ÐÎÏ

update ¤ä checkout ¤Î¿Ê¹Ô¾õ¶·¤òÃΤ餻¤ë¤¿¤á¤Ë¡¢ ½èÍýÃæ¤Î¥Õ¥¡¥¤¥ë̾¤¬°ì¹Ô¤º¤Äɽ¼¨¤µ¤ì¡¢ ¹ÔƬ¤Ë¤Ï¥Õ¥¡¥¤¥ë¤Î¾õÂÖ¤ò¼¨¤¹Ê¸»ú¤¬Éղ䵤ì¤Þ¤¹:

U file

¥ê¥Ý¥¸¥È¥ê¤È°ìÃפ¹¤ë¤è¤¦¤Ë¥Õ¥¡¥¤¥ë¤¬¹¹¿·¤µ¤ì¤¿¤³¤È¤ò¼¨¤·¤Þ¤¹¡£ ¥ê¥Ý¥¸¥È¥ê¤Ë¸ºß¤¹¤ë¥Õ¥¡¥¤¥ë¤¬ºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤Ë̵¤«¤Ã¤¿¾ì¹ç¤ä¡¢ ½¤Àµ¤·¤Æ¤¤¤Ê¤¤ºî¶È¥³¥Ô¡¼¤è¤ê¤â¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤¬ ¥ê¥Ý¥¸¥È¥ê¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤¿¾ì¹ç¤Î½èÍý¤Ç¤¹¡£

P file

U’ ¤ÈƱÍͤǤ¹¤¬¡¢CVS ¥µ¡¼¥Ð¤Ï¥Õ¥¡¥¤¥ëÁ´ÂΤǤϤʤ¯¡¢¥Ñ¥Ã¥Á¤ò Á÷¤ê¤Þ¤¹¡£2¤Ä¶¦·ë²Ì¤ÏƱ¤¸¤Ç¤¹¡£

A file

ºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥Õ¥¡¥¤¥ë¤¬²Ã¤¨¤é¤ì¡¢¤½¤ì¤ò¥ê¥Ý¥¸¥È¥ê¤Ë È¿±Ç¤¹¤ë¤¿¤á¤Ë ‘commit’ ¤Î¼Â¹Ô¤¬É¬ÍפʾõÂÖ¤ò¼¨¤·¤Þ¤¹¡£ ¤Ä¤Þ¤ê¥Õ¥¡¥¤¥ë¤Î³ÊǼ¤ò˺¤ì¤Ê¤¤¤è¤¦¤ËÃí°Õ¤òÂ¥¤·¤Æ¤¤¤Þ¤¹¡£

R file

ºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¥Õ¥¡¥¤¥ë¤¬ºï½ü¤µ¤ì¡¢¤½¤ì¤ò¥ê¥Ý¥¸¥È¥ê¤Ë È¿±Ç¤¹¤ë¤¿¤á¤Ë ‘commit’ ¤Î¼Â¹Ô¤¬É¬ÍפʾõÂÖ¤ò¼¨¤·¤Þ¤¹¡£ ¤Ä¤Þ¤ê¥Õ¥¡¥¤¥ë¤Î³ÊǼ¤ò˺¤ì¤Ê¤¤¤è¤¦¤ËÃí°Õ¤òÂ¥¤·¤Æ¤¤¤Þ¤¹¡£

M file

ºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤Ç½¤Àµ¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ç¤¢¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£

M’ ¤Ï¡¢¥Õ¥¡¥¤¥ë¤ËÂФ¹¤ë¼¡¤ÎÆó¤Ä¤Î½¤Àµ¾õÂ֤Τ¦¤Á¤Î°ìÊý¤ò¼¨¤·¤Þ¤¹¡£ °ì¤ÄÌܤϡ¢¥ê¥Ý¥¸¥È¥ê¤ÎÅö³º¥Õ¥¡¥¤¥ë¤¬½¤Àµ¤µ¤ì¤Æ¤¤¤Ê¤¤¤¿¤á¡¢ ¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¤¢¤Ê¤¿¤¬ºÇ¸å¤Ë¸«¤¿¤È¤­¤ÈƱ¤¸¾õÂ֤ˤ¢¤ë¾ì¹ç¤Ç¤¹¡£ Æó¤ÄÌܤϡ¢ºî¶È¥³¥Ô¡¼¤ÈƱÍͤˡ¢ ¥ê¥Ý¥¸¥È¥ê¤ÎÅö³º¥Õ¥¡¥¤¥ë¤â½¤Àµ¤µ¤ì¤Æ¤¤¤¿¤¿¤á¡¢ ¤³¤ì¤é¤òºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤Ç¥Þ¡¼¥¸¤·¤¿·ë²Ì¡¢ ¾×ÆÍ¤¹¤ë¤³¤È¤Ê¤¯Àµ¾ï¤Ë½èÍý¤µ¤ì¤¿¾ì¹ç¤Ç¤¹¡£

¥Õ¥¡¥¤¥ë¤Î¥Þ¡¼¥¸¤¬¹Ô¤ï¤ì¤ë¤È¤½¤Î»Ý¤¬É½¼¨¤µ¤ì¡¢ (update ¤¬¼Â¹Ô¤µ¤ì¤ëÁ°¤ÈƱ¤¸ÆâÍÆ¤Î) ºî¶È¥Õ¥¡¥¤¥ë¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¡¦¥³¥Ô¡¼¤¬À¸À®¤µ¤ì¤Þ¤¹¡£ update ¤Î¼Â¹ÔÃæ¤Ë¤½¤Î¥Õ¥¡¥¤¥ë¤Î̾Á°¤â¤Á¤ã¤ó¤Èɽ¼¨¤µ¤ì¤Þ¤¹¡£

C file

file ¤Îºî¶È¥³¥Ô¡¼¤Ø¤ÎÊѹ¹¤È¥ê¥Ý¥¸¥È¥ê¤Ç¤ÎÊѹ¹¤ò¥Þ¡¼¥¸¤·¤¿ºÝ¤Ë¡¢ ¾×ÆÍ¤¬¸«¤Ä¤«¤Ã¤¿¤³¤È¤ò¼¨¤·¤Þ¤¹¡£ file (ºî¶È¥³¥Ô¡¼) ¤Ï 2¤Ä¤Î¥ê¥Ó¥¸¥ç¥ó¤ò¥Þ¡¼¥¸¤·¤è¤¦¤È¤·¤¿·ë²Ì¤ËÃÖ¤­´¹¤¨¤é¤ì¡¢ ¸µ¤Î¥Õ¥¡¥¤¥ë¤Ï .#file.revision ¤È¤¤¤¦Ì¾Á°¤Ç¡¢ ºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤ËÊݸ¤µ¤ì¤Þ¤¹¡£¤³¤³¤Ç revision ¤Ï¡¢ ¥Õ¥¡¥¤¥ë¤Î½¤Àµ¤ò³«»Ï¤·¤¿»þÅÀ¤Ç¤Î RCS ¥ê¥Ó¥¸¥ç¥ó¤Ç¤¹¡£Conflicts example ¤ÎÀâÌÀ¤ò»²¹Í¤Ë¤·¤Æ ¾×ÆÍ¤ò²ò·è¤·¤Æ²¼¤µ¤¤¡£ (.# ¤Ç»Ï¤Þ¤ë¥Õ¥¡¥¤¥ë¤ò¿ôÆü´ÖÍøÍѤ·¤Ê¤«¤Ã¤¿¾ì¹ç¡¢ ¼«Æ°Åª¤Ëºï½ü¤¹¤ë¥·¥¹¥Æ¥à¤¬¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ²¼¤µ¤¤¡£ ¸µ¤Î¥Õ¥¡¥¤¥ë¤òÊݸ¤·¤¿¤¤¾ì¹ç¤Ï̾Á°¤òÊѹ¹¤¹¤ë¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£) VMS ¤Ç¤Ï¥Õ¥¡¥¤¥ë̾¤ÎÀèÆ¬¤Ë¡¢ .# ¤Ç¤Ï¤Ê¤¯ __ ¤ò»ÈÍѤ·¤Þ¤¹¡£

? file

ºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤Ë file ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¤±¤ì¤É¡¢ ¥ê¥Ý¥¸¥È¥ê¤Ë¤ÏÂбþ¤¹¤ë¥Õ¥¡¥¤¥ë¤¬Ìµ¤¯¡¢ CVS ¤¬Ìµ»ë¤¹¤ë¥Õ¥¡¥¤¥ë¤Î°ìÍ÷¤Ë¤âÆþ¤Ã¤Æ¤Ê¤¤¤³¤È¤ò¼¨¤·¤Þ¤¹ (‘-I’ ¥ª¥×¥·¥ç¥ó¤ÎÀâÌÀµÚ¤Ó see cvsignore ¤ò»²¾È)¡£