Next: , Previous: Magic branch numbers, Up: Branching and merging   [Contents][Index]


5.6 »ÞÁ´ÂΤò¥Þ¡¼¥¸¤¹¤ë

update ¥³¥Þ¥ó¥É¤Ë ‘-j branch’ ¥Õ¥é¥°¤òÉÕ¤±¤ë¤È¡¢ »Þ¤Ë²Ã¤¨¤é¤ì¤¿Êѹ¹¤òºî¶È¥³¥Ô¡¼¤ËÈ¿±Ç¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ ‘-j branch’ ¥ª¥×¥·¥ç¥ó¤¬1¤Ä¤À¤±¤À¤È¡¢ »Þ¤Îʬ´ôÅÀ¤È»Þ¤ÎºÇ¿·¥ê¥Ó¥¸¥ç¥ó´Ö¤Î°ã¤¤¤ò (¤¢¤Ê¤¿¤Îºî¶È¥³¥Ô¡¼¤Ë) ¥Þ¡¼¥¸¤·¤Þ¤¹¡£

-j’ ¤Ï¡¢“join” ¤Îά¤Ç¤¹¡£

¼¡¤Î¥ê¥Ó¥¸¥ç¥ó¡¦¥Ä¥ê¡¼¤ò¹Í¤¨¤Þ¤¹¡£

+-----+    +-----+    +-----+    +-----+
! 1.1 !----! 1.2 !----! 1.3 !----! 1.4 !      <- The main trunk
+-----+    +-----+    +-----+    +-----+
                !
                !
                !   +---------+    +---------+
Branch R1fix -> +---! 1.2.2.1 !----! 1.2.2.2 !
                    +---------+    +---------+

»Þ 1.2.2 ¤Ë¤Ï ‘R1fix’ ¤È¤¤¤¦¥¿¥° (ʸ»úÎó) ¤¬ÉÕ¤±¤é¤ì¤Æ¤¤¤Þ¤¹¡£¼¡ ¤Ï m.c ¤È¤¤¤¦¥Õ¥¡¥¤¥ë1¤Ä¤ò´Þ¤à¥â¥¸¥å¡¼¥ë ‘mod’ ¤ÎÎã¤Ç¤¹¡£

$ cvs checkout mod               # ºÇ¿·¤Î¥ê¥Ó¥¸¥ç¥ó 1.4 ¤ò¼è¤ê½Ð¤¹

$ cvs update -j R1fix m.c        # »Þ¤Ç¹Ô¤Ê¤ï¤ì¤¿Êѹ¹(¥ê¥Ó¥¸¥ç¥ó 1.2
                                 # ¤È 1.2.2.2 ¤Îº¹Ê¬)¤òºî¶È¥³¥Ô¡¼¤ËÄɲÃ

$ cvs commit -m "Included R1fix" # ¥ê¥Ó¥¸¥ç¥ó 1.5 ¤òºîÀ®

¥Þ¡¼¥¸ºî¶È¤Ç¾×ÆÍ¤¬µ¯¤­¤ë¤³¤È¤â¤¢¤ê¤Þ¤¹¤¬¡¢¾×ÆÍ¤¬µ¯¤­¤¿¾ì¹ç¤Ï¡¢¤½¤ì¤ò²ò ·è¤·¤Æ¤«¤é¿·¤·¤¤¥ê¥Ó¥¸¥ç¥ó¤ò³ÊǼ¤·¤Æ²¼¤µ¤¤¡£ See Conflicts example.

¤â¤·¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Ë¥­¡¼¥ï¡¼¥É¤¬¤¢¤ì¤Ð (see Keyword substitution), ËÜÅö¤ËɬÍפʤâ¤Î¤è¤ê¤â;ʬ¤Ë¾×ÆÍ¤òÆÀ¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¤³¤ì¤ò²óÈò¤¹¤ëÊý Ë¡¤Ï Merging and keywords ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£

checkout ¥³¥Þ¥ó¥É¤Ç¤â¥Õ¥é¥° ‘-j branch’ ¤ò»ÈÍѤǤ­¤Þ¤¹¡£ °Ê²¼¤ÎÍͤˤ·¤Æ¾åµ­¤ÈƱ¤¸¸ú²Ì¤òÆÀ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:

$ cvs checkout -j R1fix mod
$ cvs commit -m "Included R1fix"