Next: Branches and revisions, Previous: Creating a branch, Up: Branching and merging [Contents][Index]
2 ¤Ä¤ÎÊýË¡¤Î¤É¤Á¤é¤«¤Ç»Þ¤ò¼èÆÀ¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹: ¥ê¥Ý¥¸¥È¥ê¤«¤é¿·¤·¤¯ ¼è¤ê½Ð¤¹¤«¡¢Â¸ºß¤¹¤ëºî¶È¥³¥Ô¡¼¤ò¤½¤Î»Þ¤ËÀڤ괹¤¨¤ëÊýË¡¤Ç¤¹¡£
¥ê¥Ý¥¸¥È¥ê¤«¤é»Þ¤ò¼è¤ê½Ð¤¹¤Ë¤Ï ‘checkout’ ¤ò¥Õ¥é¥° ‘-r’ ¤È¡¢ ¤½¤Î¸å¤Ë»Þ¤Î¥¿¥°Ì¾¤ò³¤±¤Æµ¯Æ°¤·¤Þ¤¹ (see Creating a branch)¡£
$ cvs checkout -r rel-1-0-patches tc
¤â¤·¤¯¤Ï¡¢´û¤Ëºî¶È¥³¥Ô¡¼¤ò»ý¤Ã¤Æ¤¤¤ì¤Ð¡¢‘update -r’ ¤ÇǤ°Õ¤Î»Þ¤Ë Àڤ괹¤¨¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹:
$ cvs update -r rel-1-0-patches tc
¤â¤·¤¯¤Ï¡¢¤½¤ì¤ÈÅù²Á¤Ê:
$ cd tc $ cvs update -r rel-1-0-patches
ºî¶È¥³¥Ô¡¼¤¬¸µ¡¹´´¤Ë¤¢¤Ã¤¿¤«Â¾¤Î»Þ¤Ë¤¢¤Ã¤¿¤«¤Ï´Ø·¸¤¢¤ê¤Þ¤»¤ó – ¾å¤Î¥³ ¥Þ¥ó¥É¤Ï¤½¤ì¤ò»ØÄꤵ¤ì¤¿Ì¾Á°¤Î»Þ¤ËÀڤ괹¤¨¤Þ¤¹¡£ÉáÄ̤Π‘update’ ¥³¥Þ¥ó¥É¤ÈƱÍͤˡ¢‘update -r’ ¤ÏÁ´¤Æ¤ÎÊѹ¹¤ò¥Þ¡¼¥¸¤·¡¢¾×ÆÍ¤¬¤É¤³ ¤Çµ¯¤³¤Ã¤¿¤«¤òÃΤ餻¤Þ¤¹¡£
°ìÅÙÆÃÄê¤Î»Þ¤Ë·ë¤ÓÉÕ¤±¤é¤ì¤¿ºî¶È¥³¥Ô¡¼¤ò¼ê¤ËÆþ¤ì¤ë¤È¡¢»Ø¼¨¤·¤Ê¤¤¸Â¤ê¤½ ¤³¤Ë»Ä¤ê³¤±¤Þ¤¹¡£¤³¤ì¤Ï¡¢ºî¶È¥³¥Ô¡¼¤«¤é³ÊǼ¤µ¤ì¤¿Êѹ¹¤Ï¤½¤Î»Þ¤Ë¿·¤·¤¤ ¥ê¥Ó¥¸¥ç¥ó¤ò²Ã¤¨¤Þ¤¹¤¬¡¢´´¤È¾¤Î»Þ¤Ë¤Ï±Æ¶Á¤òµÚ¤Ü¤µ¤Ê¤¤¤È¤¤¤¦¤³¤È¤Ç¤¹¡£
ºî¶È¥³¥Ô¡¼¤¬¤É¤Î»Þ¤Ç¤¢¤ë¤«¤òÃΤ뤿¤á¤Ë¡¢¥³¥Þ¥ó¥É ‘status’ ¤ò»È¤¦ ¤³¤È¤¬¤Ç¤¤Þ¤¹¡£¤½¤Î½ÐÎϤǡ¢‘Sticky tag’ ¤È¤¤¤¦Ì¾Á°¤Î¾ì½ê¤òõ¤·¤Æ ¤¯¤À¤µ¤¤ (see Sticky tags) – ¤½¤ì¤Ï¸½ºß¤Îºî¶È¥Õ¥¡¥¤¥ë¤Ë¡¢¤â¤·»Þ¤¬ ¤¢¤ì¤Ð¡¢¤½¤ì¤ò¶µ¤¨¤ë CVS ¤ÎÊýË¡¤Ç¤¹:
$ cvs status -v driver.c backend.c =================================================================== File: driver.c Status: Up-to-date Version: 1.7 Sat Dec 5 18:25:54 1992 RCS Version: 1.7 /u/cvsroot/yoyodyne/tc/driver.c,v Sticky Tag: rel-1-0-patches (branch: 1.7.2) Sticky Date: (none) Sticky Options: (none) Existing Tags: rel-1-0-patches (branch: 1.7.2) rel-1-0 (revision: 1.7) =================================================================== File: backend.c Status: Up-to-date Version: 1.4 Tue Dec 1 14:39:01 1992 RCS Version: 1.4 /u/cvsroot/yoyodyne/tc/backend.c,v Sticky Tag: rel-1-0-patches (branch: 1.4.2) Sticky Date: (none) Sticky Options: (none) Existing Tags: rel-1-0-patches (branch: 1.4.2) rel-1-0 (revision: 1.4) rel-0-4 (revision: 1.4)
¤½¤ì¤¾¤ì¤Î¥Õ¥¡¥¤¥ë¤Î»ÞÈֹ椬°ã¤¦¤È¤¤¤¦»ö¼Â¤Ëº®Í𤷤ʤ¤¤Ç¤¯¤À¤µ¤¤ (¤½¤ì¤¾¤ì ‘1.7.1’ ¤È ‘1.4.2’ ¤Ç¤¹)¡£»Þ¥¿¥°¤ÏƱ¤¸ ‘rel-1-0-patches’ ¤Ç¡¢¥Õ¥¡¥¤¥ë¤Ï¼ÂºÝ¤ËƱ¤¸»Þ¤Ë¤¢¤ê¤Þ¤¹¡£ÈÖ¹æ¤Ïñ ¤Ë»Þ¤¬ºî¤é¤ì¤¿¤È¤¤Î¤½¤ì¤¾¤ì¤Î¥Õ¥¡¥¤¥ë¤Î¥ê¥Ó¥¸¥ç¥óÍúÎò¤òÈ¿±Ç¤·¤Æ¤¤¤Þ¤¹¡£ ¾å¤ÎÎã¤Ç¤Ï¡¢¤³¤Î»Þ¤¬ºîÀ®¤µ¤ì¤ëÁ°¤Ë¡¢‘driver.c’ ¤¬ ‘backend.c’ ¤è¤ê¤â¿¤¯¤ÎÊѹ¹¤¬À®¤µ¤ì¤¿¤È¤¤¤¦¤³¤È¤òƳ¤½Ð¤¹¤³¤È¤¬ ¤Ç¤¤Þ¤¹¡£
»ÞÈֹ椬ºîÀ®¤µ¤ì¤ëÊýË¡¤Î¾ÜºÙ¤Ï Branches and revisions ¤ò»²¾È¤·¤Æ ¤¯¤À¤µ¤¤¡£