Next: , Previous: Accessing branches, Up: Branching and merging   [Contents][Index]


5.4 »Þ¤È¥ê¥Ó¥¸¥ç¥ó

ÉáÄ̤ϥե¡¥¤¥ë¤Î¥ê¥Ó¥¸¥ç¥óÍúÎò¤ÏÀþ·ÁÁý²Ã¤Ç¤¹ (see Revision numbers):

       +-----+    +-----+    +-----+    +-----+    +-----+
       ! 1.1 !----! 1.2 !----! 1.3 !----! 1.4 !----! 1.5 !
       +-----+    +-----+    +-----+    +-----+    +-----+

¤·¤«¤·¡¢CVS ¤ÏÀþ·Á¤Î³«È¯¤Ë¸Â¤é¤ì¤Æ¤¤¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¥ê ¥Ó¥¸¥ç¥ó¡¦¥Ä¥ê¡¼ ¤Ï »Þ ¤Ëʬ³ä¤¹¤ë¤³¤È¤¬¤Ç¤­¡¢¤½¤ì¤¾¤ì¤Î»Þ¤ÏÊÌ¤Ë °Ý»ý¤µ¤ì¤¿³«È¯¥é¥¤¥ó¤Ç¤¹¡£»Þ¤Ë¤Ê¤µ¤ì¤¿Êѹ¹¤Ï´Êñ¤Ë´´¤ËÌ᤹¤³¤È¤¬¤Ç¤­¤Þ ¤¹¡£

¤½¤ì¤¾¤ì¤Î»Þ¤Ë¤Ï »ÞÈÖ¹æ ¤¬¤¢¤ê¡¢¥Ô¥ê¥ª¥É¤Çʬ¤±¤é¤ì¤¿´ñ¿ô¸Ä¤Î10¿Ê À°¿ô¤«¤éÀ®¤ê¤Þ¤¹¡£»ÞÈÖ¹æ¤Ï»Þ¤¬Ê¬´ô¤·¤¿¸µ¤Î»Þ¤ËÂбþ¤¹¤ë¥ê¥Ó¥¸¥ç¥óÈÖ¹æ¤Ë À°¿ô¤òÄɲ乤뤳¤È¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤Þ¤¹¡£»ÞÈÖ¹æ¤Ë¤è¤ê¡¢ÆÃÄê¤Î¥ê¥Ó¥¸¥ç¥ó ¤«¤é 1 ¤Ä°Ê¾å¤Î»Þ¤ò»Þʬ¤«¤ì¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£

»Þ¤ÎÁ´¤Æ¤Î¥ê¥Ó¥¸¥ç¥ó¤Ï»ÞÈÖ¹æ¤ËÉáÄ̤οô»ú¤òÄɲ乤뤳¤È¤Ç·ÁÀ®¤µ¤ì¤Þ¤¹¡£ ²¼¿Þ¤Ë¡¢Á°½Ò¤ÎÎ㤫¤é»Þ¤¬È¯Å¸¤·¤¿Îã¤ò¼¨¤·¤Þ¤¹¡£

                                                      +-------------+
                           Branch 1.2.2.3.2 ->        ! 1.2.2.3.2.1 !
                                                    / +-------------+
                                                   /
                                                  /
                 +---------+    +---------+    +---------+
Branch 1.2.2 -> _! 1.2.2.1 !----! 1.2.2.2 !----! 1.2.2.3 !
               / +---------+    +---------+    +---------+
              /
             /
+-----+    +-----+    +-----+    +-----+    +-----+
! 1.1 !----! 1.2 !----! 1.3 !----! 1.4 !----! 1.5 !  <- The main trunk
+-----+    +-----+    +-----+    +-----+    +-----+
                !
                !
                !   +---------+    +---------+    +---------+
Branch 1.2.4 -> +---! 1.2.4.1 !----! 1.2.4.2 !----! 1.2.4.3 !
                    +---------+    +---------+    +---------+

»ÞÈֹ椬ºîÀ®¤µ¤ì¤ë¸·Ì©¤Ê¾ÜºÙ¤ÏÉáÄ̤ϵ¤¤Ë¤·¤Ê¤¯¤ÆÎɤ¤¤Î¤Ç¤¹¤¬¡¢°Ê²¼¤¬Æ° ºî¤ÎÊýË¡¤Ç¤¹: CVS ¤¬»ÞÈÖ¹æ¤òºîÀ®¤¹¤ë¤È¤­¤Ï¡¢2 ¤«¤é»Ï¤Þ¤ëºÇ½é¤Î̤ »ÈÍѤζö¿ô¤òÁª¤Ó¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢¥ê¥Ó¥¸¥ç¥ó 6.4 ¤«¤é»Þ¤òºîÀ®¤·¤¿¤¤¤È¤­ ¤Ï¡¢¤½¤ì¤Ï 6.4.2 ¤È¤¤¤¦ÈÖ¹æ¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£Îí¤Ç½ª¤ï¤ëÁ´¤Æ¤Î»ÞÈÖ¹æ (6.4.0 ¤Î¤è¤¦¤Ë) ¤Ï CVS ¤ÎÆâÉô¤Ç»ÈÍѤµ¤ì¤Þ¤¹ (see Magic branch numbers)¡£»Þ 1.1.1 ¤ÏÆÃÊ̤ʰÕÌ£¤ò»ý¤Á¤Þ¤¹¡£See Tracking sources.