Next: , Previous: Avoiding substitution, Up: Keyword substitution   [Contents][Index]


12.4 ÃÖ´¹¥â¡¼¥É

³Æ¥Õ¥¡¥¤¥ë¤Ë¤Ï´ûÄê¤ÎÃÖ´¹¥â¡¼¥É¤¬ÀßÄꤵ¤ì¤Æ¤ª¤ê¡¢ ºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤Î³Æ¥Õ¥¡¥¤¥ë¤ÎÃÖ´¹¥â¡¼¥É¤âÊÌ¡¹¤ËÀßÄê¤Ç¤­¤Þ¤¹¡£ Á°¼Ô¤Ï cvs add ¤ä cvs admin ¤Ë ¥ª¥×¥·¥ç¥ó ‘-k’ ¤òÉÕ¤±¤ÆÀßÄꤷ¤Þ¤¹¡£ ¸å¼Ô¤Ï cvs checkout ¤ä cvs update ¤Ë ¥ª¥×¥·¥ç¥ó ‘-k’ ¤ä ‘-A’ ¤òÉÕ¤±¤ÆÀßÄꤷ¤Þ¤¹¡£ cvs diff ¤Ë¤â ‘-k’ ¥ª¥×¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤¹¡£ Î㤬´ö¤Ä¤«¤¢¤ê¤Þ¤¹¤Î¤Ç¡¢Binary files ¤È Merging and keywords »²¾È¡£

ÍøÍѤǤ­¤ë¥â¡¼¥É¤ò°Ê²¼¤Ë¼¨¤·¤Þ¤¹:

-kkv

´ûÄê·Á¼°¤Ç¥­¡¼¥ï¡¼¥Éʸ»úÎó¤òÀ¸À®¤·¤Þ¤¹¡£ Î㤨¤Ð¡¢¥­¡¼¥ï¡¼¥É Revision ¤ËÂФ·¤Æ $Revision: 5.7 $ ¤¬À¸À®¤µ¤ì¤Þ¤¹¡£

-kkvl

-kkv’ ¤È¤Û¤ÜƱÍͤǤ¹¤¬¡¢ »ØÄꤵ¤ì¤¿¥ê¥Ó¥¸¥ç¥ó¤¬¥í¥Ã¥¯¤µ¤ì¤Æ¤¤¤ì¤Ð¡¢ ¥í¥Ã¥¯¤·¤Æ¤¤¤ë¿Íʪ¤Î̾Á°¤òÁÞÆþ¤·¤Þ¤¹¡£ ¥í¥Ã¥¯¤·¤Æ¤¤¤ë¿Íʪ̾¤Ï cvs admin -l ¤¬»ÈÍѤµ¤ì¤Æ¤¤¤ë¤È¤­¤À¤±´Ø ·¸¤¬¤¢¤ê¤Þ¤¹¡£

-kk

¥­¡¼¥ï¡¼¥Éʸ»úÎ󤫤饭¡¼¥ï¡¼¥É¤Î¤ß¤òÀ¸À®¤·¡¢¤½¤ÎÃͤϾÊά¤µ¤ì¤Þ¤¹¡£ Î㤨¤Ð¡¢¥­¡¼¥ï¡¼¥É Revision ¤ËÂФ·¤Æ¡¢ $Revision: 5.7 $ ¤Ç¤Ï¤Ê¤¯¡¢ $Revision$ ¤¬À¸À®¤µ¤ì¤Þ¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥ê¥Ó¥¸¥ç¥ó´Ö¤Î°ã¤¤¤òÈæ³Ó¤¹¤ë»þ¡¢ ¥­¡¼¥ï¡¼¥É¤Ë¤è¤ë°ã¤¤¤ò̵»ë¤¹¤ë¤Î¤ËÊØÍø¤Ç¤¹ (see Merging and keywords)¡£

-ko

¤½¤Î¥Õ¥¡¥¤¥ë¤¬³ÊǼ¤µ¤ì¤ëÁ°¤Î¡¢ ¸Å¤¤¥­¡¼¥ï¡¼¥Éʸ»úÎó¤òÀ¸À®¤·¤Þ¤¹¡£ Î㤨¤Ð¡¢¥­¡¼¥ï¡¼¥É Revision ¤ËÂФ·¤Æ¡¢ $Revision: 5.7 $ ¤Ç¤Ï¤Ê¤¯¡¢ ¥Õ¥¡¥¤¥ë¤¬³ÊǼ¤µ¤ì¤¿»þ¤Îʸ»úÎó¤Ç¤¢¤ë $Revision: 1.1 $ ¤¬À¸À®¤µ¤ì¤Þ¤¹¡£

-kb

-ko’ ¤ÈƱÍͤǤ¹¤¬¡¢ ¥ê¥Ý¥¸¥È¥ê¤Ë³ÊǼ¤µ¤ì¤ëɸ½àŪ¤Ê¹ÔËö·Á¼° (¥é¥¤¥ó¥Õ¥£¡¼¥É¤Î¤ß) ¤ò¡¢ ¥¯¥é¥¤¥¢¥ó¥È¦¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ËŬ¤·¤¿·Á¼°¤ØÊÑ´¹¤·¤Þ¤»¤ó¡£ ¹Ôü¤Ë¥é¥¤¥ó¥Õ¥£¡¼¥É¤Î¤ß¤¬»ÈÍѤµ¤ì¤ë¥·¥¹¥Æ¥à (unix Åù) ¤Ç¤Ï¡¢ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï ‘-ko’ ¤ÈƱ¤¸¤Ç¤¹¡£ ¥Ð¥¤¥Ê¥ê¡¦¥Õ¥¡¥¤¥ë¤Î¾ÜºÙ¾ðÊó¤Ï Binary files »²¾È¡£

-kv

¥­¡¼¥ï¡¼¥É¤ÎÃͤΤߤòÀ¸À®¤·¤Þ¤¹¡£ Î㤨¤Ð¡¢¥­¡¼¥ï¡¼¥É Revision ¤ËÂФ·¤Æ¡¢ $Revision: 5.7 $ ¤Ç¤Ï¤Ê¤¯¡¢ 5.7 ¤¬À¸À®¤µ¤ì¤Þ¤¹¡£ ¤³¤ì¤Ï¡¢$Revision: $ ¤È¤¤¤Ã¤¿¡¢ ¥­¡¼¥ï¡¼¥É¼±Ê̻Ҥò½ü¤¯¤Î¤¬º¤Æñ¤Ê ¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Î¥Õ¥¡¥¤¥ë¤òÀ¸À®¤¹¤ë»þ¤ËÊØÍø¤Ç¤¹¡£ ¤·¤«¤·¡¢¥­¡¼¥ï¡¼¥É̾¤¬ºï½ü¤µ¤ì¤Æ¤·¤Þ¤¦¤¿¤á¤Ë¡¢ ¤³¤ì°Ê¸å¤Ï¥­¡¼¥ï¡¼¥ÉÃÖ´¹¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£ ½¾¤Ã¤Æ»ÈÍѤˤÏÃí°Õ¤¬É¬ÍפǤ¹¡£

¥ª¥×¥·¥ç¥ó ‘-kv’ ¤Ï¡¢cvs export ¤Ç»ÈÍѤµ¤ì¤ë»ö¤¬ ¿¤¯¤¢¤ê¤Þ¤¹—see export¡£ ¤·¤«¤·¥â¥¸¥å¡¼¥ë¤¬¥Ð¥¤¥Ê¥ê¡¦¥Õ¥¡¥¤¥ë¤ò´Þ¤à¾ì¹ç¤Ï¡¢ ¤¦¤Þ¤¯½èÍý¤Ç¤­¤Ê¤¤¤Î¤Ç»ÈÍѤ·¤Ê¤¤Êý¤¬¸­ÌÀ¤Ç¤¹¡£