Previous: Tagging add/remove, Up: Revisions   [Contents][Index]


4.9 ޤêÉÕ¤¤¤¿¥¿¥°

ºî¶È¥³¥Ô¡¼¤Î¥ê¥Ó¥¸¥ç¥ó¤Ë¤Ï´ØÏ¢¤·¤¿ÄɲäΥǡ¼¥¿¤¬¤¢¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£Îã ¤¨¤Ð¡¢»Þ¤Ç¤¢¤Ã¤¿¤ê (see Branching and merging)¡¢‘checkout -D’ ¤« ‘update -D’ ¤Ë¤è¤Ã¤ÆÆÃÄê¤ÎÆü»þ¤è¤êÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤ËÀ©¸Â¤µ¤ì¤Æ¤¤ ¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¤³¤Î¥Ç¡¼¥¿¤Ï±Ê³¤·¤Þ¤¹¤Î¤Ç – ¤¹¤Ê¤ï¤Á¡¢ºî¶È¥³¥Ô¡¼¤Î »Ä¤ê¤Î¥³¥Þ¥ó¥É¤ËŬÍѤµ¤ì¤Þ¤¹ – ²æ¡¹¤Ï¤½¤ì¤ò ޤêÉÕ¤±¤é¤ì¤¿ ¤Èɽ ¸½¤·¤Þ¤·¤¿¡£

¤¿¤¤¤Æ¤¤¤Î¾ì¹ç¡¢Å½¤êÉÕ¤­¤Ï¹Í¤¨¤ëɬÍפΤʤ¤ CVS ¤Î±£¤ì¤¿Â¦Ì̤Ǥ¹¡£ ¤·¤«¤·¡¢¤³¤Îµ¡Ç½¤ò»È¤¤¤¿¤¯¤Ê¤¤¤È¤·¤Æ¤â¡¢Å½¤êÉÕ¤±¤é¤ì¤¿¥¿¥°¤Ë´Ø¤·¤Æ ²¿¤« ÃΤëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó (Î㤨¤Ð¡¢¤½¤ì¤òÈò¤±¤ëÊýË¡!).

ޤêÉÕ¤¤¤¿¥¿¥° (sticky tag) ¤äÆüÉÕ¤òÄ´¤Ù¤ë¤Ë¤Ï¡¢ status ¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Þ¤¹:

$ cvs status driver.c
===================================================================
File: driver.c          Status: Up-to-date

    Version:            1.7.2.1 Sat Dec  5 19:35:03 1992
    RCS Version:        1.7.2.1 /u/cvsroot/yoyodyne/tc/driver.c,v
    Sticky Tag:         rel-1-0-patches (branch: 1.7.2)
    Sticky Date:        (none)
    Sticky Options:     (none)

ºî¶È¥Õ¥¡¥¤¥ë¤ËޤêÉÕ¤¤¤¿¥¿¥°¤Ï¡¢ ‘cvs update -A’ ¤ò»È¤Ã¤Æºï½ü¤¹¤ë¤Þ¤Ç»Ä¤ê¤Þ¤¹¡£ ¥ª¥×¥·¥ç¥ó ‘-A’ ¤Ï¡¢¥Õ¥¡¥¤¥ë¤ò´´¤ÎÀèÆ¬¤Î¥Ð¡¼¥¸¥ç¥ó¤ËÌᤷ¡¢ ޤêÉÕ¤¤¤¿¥¿¥°, ÆüÉÕ, ¥ª¥×¥·¥ç¥ó¤òÁ´¤ÆÇí¤·¤Þ¤¹¡£

ޤêÉÕ¤±¤é¤ì¤¿¥¿¥°¤Î°ìÈÖÉáÄ̤λÈÍÑË¡¤Ï¡¢Accessing branches ¤ÇÀâ ÌÀ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¤É¤Î»Þ¤Çºî¶È¤·¤Æ¤¤¤ë¤«¤ò³Îǧ¤¹¤ë¤³¤È¤Ç¤¹¡£¤·¤«¤·¡¢»Þ ¤Ç¤Ê¤¤Å½¤êÉÕ¤­¥¿¥°¤Ë¤âÍøÍÑË¡¤Ï¤¢¤ê¤Þ¤¹¡£ ¤³¤³¤Ç¤Ï¡¢Â¾¿Í¤ÎÊѹ¹¤¬°ÂÄꤷ¤Æ¤¤¤ë¤«¤É¤¦¤«Ê¬¤é¤Ê¤¤¤Î¤Ç¡¢ ºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤ò¹¹¿·¤·¤¿¤¯¤Ê¤¤¾ì¹ç¤òÎã¤Ëµó¤²¤Æ¹Í¤¨¤Þ¤¹¡£ ¤â¤Á¤í¤ó¤³¤Î¾ì¹ç¡¢cvs update ¤Î¼Â¹Ô¤ò¹µ¤¨¤ì¤ÐºÑ¤ß¤Þ¤¹¡£ ¤·¤«¤·¡¢¹¹¿·¤·¤¿¤¯¤Ê¤¤¤Î¤¬Â礭¤Ê¥Ä¥ê¡¼¹½Â¤¤Î°ìÉôʬ¤À¤±¤Ê¤é¤Ð¡¢ ¤½¤³¤Ë¥ê¥Ó¥¸¥ç¥ó¤òޤêÉÕ¤±¤ì¤ÐÎɤ¤¤Î¤Ç¤¹¡£ ¥½¡¼¥¹¤ò¼è¤ê½Ð¤¹ºÝ¤Ë (1.4 ¤Ê¤É¤È) ¥ê¥Ó¥¸¥ç¥ó¤ò»ØÄꤹ¤ì¤Ð¡¢ ¤½¤Î¥ê¥Ó¥¸¥ç¥ó¤òޤêÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ °Ê¸å¡¢‘cvs update -A’ ¤Ë¤è¤Ã¤Æ¥¿¥°¤òÇí¤¬¤¹¤Þ¤Ç¡¢ cvs update ¤ò¼Â¹Ô¤·¤Æ¤â ºÇ¿·¥ê¥Ó¥¸¥ç¥ó¤Ë¹¹¿·¤µ¤ì¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£ ƱÍͤ˥ª¥×¥·¥ç¥ó ‘-D’ ¤ò update ¤ä checkout ¤Ë»È¤¦¤È¡¢ ޤêÉÕ¤¤¤¿ÆüÉÕ (sticky date) ¤¬ÀßÄꤵ¤ì¡¢ ¤³¤ì°Ê¹ß¤Î¥³¥Þ¥ó¥É¤Ë¤½¤ÎÆüÉÕ¤¬Í¿¤¨¤é¤ì¤Þ¤¹¡£

¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¥Õ¥¡¥¤¥ë¤ò¼è¤ê½Ð¤¹ºÝ¤Ë¡¢ ¥¿¥°¤òޤêÉÕ¤±¤¿¤¯¤Ê¤¤¾ì¹ç¤â¿¤¤¤È»×¤¤¤Þ¤¹¡£ checkout ¤ä update ¤Ë¥ª¥×¥·¥ç¥ó ‘-p’ ¤òÉÕ¤±¤ë¤È¡¢ ¥Õ¥¡¥¤¥ë¤ÎÆâÍÆ¤¬É¸½à½ÐÎϤËÁ÷¤é¤ì¤ë¤Î¤Ç¡¢¤³¤ì¤òÍøÍѤ·¤Þ¤¹¡£ Î㤨¤Ð:

$ cvs update -p -r 1.1 file1 >file1
===================================================================
Checking out file1
RCS:  /tmp/cvs-sanity/cvsroot/first-dir/Attic/file1,v
VERS: 1.1
***************
$

¤·¤«¤·¡¢¤¢¤Ê¤¿¤Î¿Ò¤Í¤Æ¤¤¤ë¤³¤È¤¬Á°¤Î³ÊǼ¤ËÌ᤹ (¤³¤ÎÎã¤Ç¤Ï¡¢ file1 ¤ò¥ê¥Ó¥¸¥ç¥ó1.1¤Ç¤¢¤Ã¤¿¤È¤­¤ËÌ᤹) ÊýË¡¤Ê¤é¡¢¤³¤ì¤¬°ìÈÖ´Ê Ã±¤ÊÊýË¡¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤½¤Î¾ì¹ç¤Ï update -j ¥ª¥×¥·¥ç¥ó¤ò update ¤ËÉÕ¤±¤ë¤Î¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£¤µ¤é¤Ê¤ëµÄÏÀ¤Ï¡¢Merging two revisions »²¾È¡£