Previous: commit options, Up: commit   [Contents][Index]


A.8.2 commit ¤Î»ÈÍÑÎã

A.8.2.1 »Þ¤ËÂФ·¤Æ³ÊǼ¤¹¤ë

¥ª¥×¥·¥ç¥ó ‘-r’ ¤òÍѤ¤¤Æ¡¢»Þ¥ê¥Ó¥¸¥ç¥ó (¥ê¥Ó¥¸¥ç¥óÈֹ椬 ¶ö¿ô¸Ä¤Î¥É¥Ã¥È¤ò´Þ¤à¤â¤Î) ¤Ë³ÊǼ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ »Þ¥ê¥Ó¥¸¥ç¥ó¤Ï rtag ¤« tag ¥³¥Þ¥ó¥É¤Ë ¥ª¥×¥·¥ç¥ó ‘-b’ ¤ò»ØÄꤷ¤ÆºîÀ®¤·¤Þ¤¹ (see Branching and merging)¡£ ¤½¤·¤Æ checkout ¤« update ¤Ç¡¢ ¿·¤·¤¯ºîÀ®¤·¤¿»Þ¤«¤é¥½¡¼¥¹¤ò¼è¤ê½Ð¤·¤Þ¤¹¡£ ¤½¤Î·ë²Ì¡¢¤³¤Îºî¶È¥½¡¼¥¹¤ËÂФ¹¤ëÊѹ¹¤ò commit ¤¹¤ë¤È¡¢ Á´¤Æ¼«Æ°Åª¤Ë»Þ¥ê¥Ó¥¸¥ç¥ó¤ÎÊý¤ËÄɲ䵤졢 ´´¤Î³«È¯·ÏÅý¤ÏÁ´¤¯±Æ¶Á¤ò¼õ¤±¤Þ¤»¤ó¡£ Î㤨¤Ð¡¢¥Ð¡¼¥¸¥ç¥ó 1.2 ¤ÎÀ½ÉʤËÂФ¹¤ë¥Ñ¥Ã¥Á¤òºîÀ®¤¹¤ëɬÍפ¬¤¢¤ë¤±¤ì¤É¡¢ ´û¤Ë¥Ð¡¼¥¸¥ç¥ó 2.0 ¤Î³«È¯¤¬»Ï¤Þ¤Ã¤Æ¤¤¤ë¤è¤¦¤Ê¾ì¹ç¡¢ °Ê²¼¤Î¤è¤¦¤Ë¤·¤Þ¤¹:

$ cvs rtag -b -r FCS1_2 FCS1_2_Patch product_module
$ cvs checkout -r FCS1_2_Patch product_module
$ cd product_module
[[ hack away ]]
$ cvs commit

¥ª¥×¥·¥ç¥ó ‘-r’ ¤Ïºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤ËޤêÉÕ¤±¤é¤ì¤ë¤¿¤á¡¢ ¤³¤ì¤ò»ØÄꤹ¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£

A.8.2.2 ÊÔ½¸¸å¤Ë»Þ¤òºîÀ®¤¹¤ë

Î㤨¤Ð¡¢Àè½µ¼è¤ê½Ð¤·¤¿¥ê¥Ó¥¸¥ç¥ó¤ò¸µ¤Ë¤·¤Æ¡¢ ¶Ë¤á¤Æ¼Â¸³Åª¤ÊÊѹ¹¤ò¥½¥Õ¥È¥¦¥§¥¢¤Ë²Ã¤¨¤Æ¤­¤¿¤È¤·¤Þ¤¹¡£ ¤³¤³¤Ç¼Â¸³¤Ë¾¤Î³«È¯¼Ô¤ò²Ã¤¨¤¿¤¤¤±¤ì¤É¡¢ ´´¤Î³«È¯·ÏÅý¤ò˸¤²¤¿¤¯¤Ê¤¤¾ì¹ç¤Ï¡¢ ¤½¤ÎÊѹ¹ÅÀ¤ò¿·¤·¤¤»Þ¤Ë³ÊǼ¤¹¤ì¤ÐÎɤ¤¤Ç¤·¤ç¤¦¡£ ¤¹¤ë¤È¾¤Î³«È¯¼Ô¤â¼Â¸³Ãæ¤Î¥³¡¼¥É¤ò¼è¤ê½Ð¤·¤Æ¡¢ CVS ¤Î¾×ÆÍ²ò·è¤Î²¸·Ã¤òÁ´¤Æ¼õ¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ ¤³¤Î¥·¥Ê¥ê¥ª¤Ï¼¡¤Î¤è¤¦¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦:

[[ hacked sources are present ]]
$ cvs tag -b EXPR1
$ cvs update -r EXPR1
$ cvs commit

update ¥³¥Þ¥ó¥É¤Ç¡¢Á´¤Æ¤Î¥Õ¥¡¥¤¥ë¤Ë ¥ª¥×¥·¥ç¥ó ‘-r EXPR1’ ¤¬Å½¤êÉÕ¤±¤é¤ì¤Þ¤¹¡£ ¤³¤Î¤È¤­¡¢update ¥³¥Þ¥ó¥É¤Ç¤Ï ¥Õ¥¡¥¤¥ë¤ËÂФ¹¤ëÊѹ¹¤¬ºï½ü¤µ¤ì¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ²¼¤µ¤¤¡£ ‘-r’ ¤¬Å½¤êÉÕ¤±¤é¤ì¤Æ¤¤¤ë¤¿¤á¡¢ commit ¤¹¤ì¤Ð¼«Æ°Åª¤ËÀµ¤·¤¤»Þ¤ËÊѹ¹¤¬³ÊǼ¤µ¤ì¤Þ¤¹¡£ ¤³¤ì¤Ï¼¡¤Î¼ê½ç¤â¤¢¤ê¤Þ¤¹:

[[ hacked sources are present ]]
$ cvs tag -b EXPR1
$ cvs commit -r EXPR1

¤·¤«¤·¤³¤Î¾ì¹ç¡¢ Êѹ¹¤µ¤ì¤Æ¤¤¤¿¥Õ¥¡¥¤¥ë¤À¤±¤Ë ‘-r EXPR1’ ¤¬Å½¤êÉÕ¤±¤é¤ì¤Þ¤¹¡£ ½¾¤Ã¤ÆÊ̤Υե¡¥¤¥ë¤òÊѹ¹¤·¤Æ¡¢¥Õ¥é¥° ‘-r EXPR1’ ¤òÉÕ¤±¤º¤Ë ³ÊǼ¤·¤¿¾ì¹ç¡¢¸í¤Ã¤Æ´´¤Ë³ÊǼ¤µ¤ì¤Æ¤·¤Þ¤¤¤Þ¤¹¡£

¾¤Î³«È¯¼Ô¤¬¼Â¸³¤Ë»²²Ã¤¹¤ëºÝ¤Ë¤Ï¡¢ ñ½ã¤Ë°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ²¼¤µ¤¤:

$ cvs checkout -r EXPR1 whatever_module