Next: , Previous: Merging more than once, Up: Branching and merging   [Contents][Index]


5.8 Æó¤Ä¤Î¥ê¥Ó¥¸¥ç¥ó´Ö¤Îº¹Ê¬¤ò¥Þ¡¼¥¸¤¹¤ë

update (¤È checkout) ¥³¥Þ¥ó¥É¤Ë ‘-j revision’ ¥Õ¥é¥°¤òÆó¤ÄÉÕ¤±¤ë¤³¤È¤Ç¡¢Ç¤°Õ¤ÎÆó¤Ä¤Î¥ê¥Ó¥¸¥ç¥ó´Ö¤Î°ã¤¤¤ò¤¢¤Ê¤¿¤Îºî¶È ¥³¥Ô¡¼¤Ë²Ã¤¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£

$ cvs update -j 1.5 -j 1.3 backend.c

¤³¤Î¤è¤¦¤Ë¤¹¤ë¤È¥ê¥Ó¥¸¥ç¥ó 1.3 ¤È 1.5 ´Ö¤ÎÊѹ¹¤ò Á´¤Æ¸µ¤ËÌ᤹¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£ ¥ê¥Ó¥¸¥ç¥ó¤ò»ØÄꤹ¤ë½ç½ø¤Ë½½Ê¬Ãí°Õ¤·¤Æ²¼¤µ¤¤!

Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¾ì¹ç¤Ï¡¢ ¥Õ¥¡¥¤¥ë¤´¤È¤Ë¥ê¥Ó¥¸¥ç¥óÈֹ椬Á´¤¯°Û¤Ê¤ë¤Ç¤¢¤í¤¦¤³¤È¤ò»×¤¤½Ð¤·¤Æ²¼¤µ¤¤¡£ Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤òÁàºî¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢ ¥ê¥Ó¥¸¥ç¥óÈÖ¹æ¤Ç¤Ï¤Ê¤¯¡¢ ɬ¤º¥¿¥°Ì¾¤òÍѤ¤¤ë¤è¤¦¤Ë¤·¤Æ²¼¤µ¤¤¡£

2¤Ä ‘-j’ ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢Äɲääºï½ü¤ò¸µ¤ËÌ᤹¤³¤È¤â¤Ç¤­¤Þ ¤¹¡£Î㤨¤Ð¡¢¥ê¥Ó¥¸¥ç¥ó1.1¤È¤·¤ÆÂ¸ºß¤·¤Æ¤¤¤¿ file1 ¤È¤¤¤¦Ì¾Á°¤Î ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¡¢¤½¤ì¤ò¾Ãµî¤·¤¿ (¤Ä¤Þ¤ê¡¢»à¤ó¤À¥ê¥Ó¥¸¥ç¥ó1.2¤òÄɲä·¤Þ ¤·¤¿) ¤È¤·¤Þ¤·¤ç¤¦¡£º£¡¢¤Þ¤¿¤½¤ì¤ò°ÊÁ°¤ÈƱ¤¸ÆâÍÆ¤ÇÄɲä·¤¿¤¤¤È»×¤Ã¤¿¤È ¤·¤Þ¤·¤ç¤¦¡£¤³¤ì¤¬¤½¤ì¤ò¤¹¤ëÊýË¡¤Ç¤¹:

$ cvs update -j 1.2 -j 1.1 file1
U file1
$ cvs commit -m test
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.3; previous revision: 1.2
done
$