Previous: Merging adds and removals, Up: Branching and merging   [Contents][Index]


5.10 ¥Þ¡¼¥¸¤È¥­¡¼¥ï¡¼¥É

¥­¡¼¥ï¡¼¥É¤ò´Þ¤à¥Õ¥¡¥¤¥ë¤ò¥Þ¡¼¥¸¤¹¤ë¤È (see Keyword substitution¡¢ Ä̾ï¥Þ¡¼¥¸¤Î´Ö¤Ë¿ô¿¤¯¤Î¾×ÆÍ¤¬µ¯¤³¤ê¤Þ¤¹¡£¤Ê¤¼¤Ê¤é¡¢¥­¡¼¥ï¡¼¥É¤Ï¥Þ¡¼¥¸ Ãæ¤Î¥ê¥Ó¥¸¥ç¥ó¤Ç°ã¤¦ÍͤËŸ³«¤µ¤ì¤Æ¤¤¤ë¤«¤é¤Ç¤¹¡£

¤Ç¤¹¤«¤é¡¢¤·¤Ð¤·¤Ð¥Þ¡¼¥¸¤Î¥³¥Þ¥ó¥É¹Ô¤Ç ‘-kk’ (see Substitution modes) ¥¹¥¤¥Ã¥Á¤ò»ØÄꤷ¤¿¤¤¤È»×¤¦¤Ç¤·¤ç¤¦¡£¥­¡¼¥ï¡¼¥É¤ÎŸ³«¤µ¤ì¤¿Ãͤò Ÿ³«¤¹¤ë¤Î¤Ç¤Ï̵¤¯¡¢¥­¡¼¥ï¡¼¥É¤Î̾Á°¤À¤±¤òÃÖ´¹¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢¤³¤Î¥ª ¥×¥·¥ç¥ó¤Ï¥Þ¡¼¥¸¤·¤Æ¤¤¤ë¥ê¥Ó¥¸¥ç¥ó¤¬¤½¤ì¤¾¤ìƱ¤¸¤³¤È¤ò³Î¼Â¤Ë¤·¤Æ¡¢¸«¤» ¤«¤±¤Î¾×ÆÍ¤ò²óÈò¤·¤Þ¤¹¡£

Î㤨¤Ð¡¢¤³¤Î¤è¤¦¤Ê¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¤È¤·¤Þ¤·¤ç¤¦:

       +---------+
      _! 1.1.2.1 !   <-  br1
     / +---------+
    /
   /
+-----+    +-----+
! 1.1 !----! 1.2 !
+-----+    +-----+

¤½¤·¤Æ¡¢ºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤Ï¸½ºß´´ (revision 1.2) ¤Ë¤¢¤ê¤Þ¤¹¡£¤½¤¦¤¹¤ë¤È¡¢ °Ê²¼¤Î·ë²Ì¤ò¥Þ¡¼¥¸¤«¤éÆÀ¤ë¤Ç¤·¤ç¤¦:

$ cat file1
key $Revision: 1.2 $
. . .
$ cvs update -j br1
U file1
RCS file: /cvsroot/first-dir/file1,v
retrieving revision 1.1
retrieving revision 1.1.2.1
Merging differences between 1.1 and 1.1.2.1 into file1
rcsmerge: warning: conflicts during merge
$ cat file1
<<<<<<< file1
key $Revision: 1.2 $
=======
key $Revision: 1.1.2.1 $
>>>>>>> 1.1.2.1
. . .

¤³¤ì¤Çµ¯¤³¤Ã¤¿¤³¤È¤Ï¡¢merge ¤¬ 1.1 ¤È 1.1.2.1 ´Ö¤Îº¹Ê¬¤òºî¶È¥Ç¥£¥ì¥¯¥È ¥ê¤Ë¥Þ¡¼¥¸¤·¤è¤¦¤È¤·¤¿¡¢¤È¤¤¤¦¤³¤È¤Ç¤¹¡£¥­¡¼¥ï¡¼¥É¤ÏRevision: 1.1 ¤«¤é Revision: 1.1.2.1 ¤Ø¤ÈÊѤï¤Ã¤Æ¤¤¤ë¤Î¤Ç¡¢CVS ¤Ï¤½ ¤ÎÊѹ¹¤òºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥Þ¡¼¥¸¤·¤è¤¦¤È¤·¤Æ¡¢¤½¤ì¤Ïºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤¬ Revision: 1.2 ¤ò´Þ¤ó¤Ç¤¤¤¿¡¢¤È¤¤¤¦»ö¼Â¤È¾×ÆÍ¤ò¤·¤Þ¤·¤¿¡£

¤³¤ì¤Ï ‘-kk’ ¤ò»ÈÍѤ·¤¿¤È¤­¤Ë¤Ëµ¯¤³¤ë¤³¤È¤Ç¤¹:

$ cat file1
key $Revision: 1.2 $
. . .
$ cvs update -kk -j br1
U file1
RCS file: /cvsroot/first-dir/file1,v
retrieving revision 1.1
retrieving revision 1.1.2.1
Merging differences between 1.1 and 1.1.2.1 into file1
$ cat file1
key $Revision$
. . .

¤³¤³¤Ç¤Ï¡¢¥ê¥Ó¥¸¥ç¥ó 1.1 ¤È¥ê¥Ó¥¸¥ç¥ó 1.1.2.1 ¤ÎξÊý¤È¤â¤¬ Revision ¤ËŸ³«¤µ¤ì¡¢¤½¤ì¤é¤ÎÊѹ¹¤òºî¶È¥³¥Ô¡¼¤Ë¥Þ¡¼¥¸¤¹¤ë¤³¤È¤Ï ²¿¤âÊѹ¹¤·¤Þ¤»¤ó¡£¤Ç¤¹¤«¤é¡¢¾×ÆÍ¤Ïµ¯¤³¤ê¤Þ¤»¤ó¡£

¤·¤«¤·¤Ê¤¬¤é¡¢¥Þ¡¼¥¸¤Ç ‘-kk’ ¤ò»È¤¦¤³¤È¤Ë¤Ï°ì¤ÄÂ礭¤ÊÃí°Õ¤¬¤¢¤ê¤Þ ¤¹¡£¤Ä¤Þ¤ê¡¢¤½¤ì¤ÏÉáÄÌ¤Ï CVS ¤¬»È¤Ã¤Æ¤¤¤¿¤Ç¤¢¤í¤¦¥­¡¼¥ï¡¼¥ÉŸ³«¤Î Íͼ°¤ò¾å½ñ¤­¤·¤Þ¤¹¡£ÆÃ¤Ë¡¢¤³¤ì¤Ï¡¢¥Ð¥¤¥Ê¥ê¥Õ¥¡¥¤¥ë¤Î¤¿¤á¤ËÍͼ°¤¬ ‘-kb’ ¤Ç¤¢¤Ã¤¿¤È¤­¤ËÌäÂê¤Ë¤Ê¤ê¤Þ¤¹¡£¤Ç¤¹¤Î¤Ç¡¢¥ê¥Ý¥¸¥È¥ê¤Ë¥Ð¥¤¥Ê ¥ê¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¤È¤­¤Ï¡¢‘-kk’ ¤ò»ÈÍѤ¹¤ë¤è¤ê¤Ï¡¢¾×ÆÍ¤ËÂн褹¤ëɬ Íפ¬¤¢¤ë¤Ç¤·¤ç¤¦¡£