Next: Secondary VC Commands, Previous: Basic VC Editing, Up: Version Control [Contents][Index]
ÈÇ´ÉÍý¤ÎÊØÍø¤Êµ¡Ç½¤Î1¤Ä¤Ï¡¢¥Õ¥¡¥¤¥ë¤ÎǤ°Õ¤ÎÈǤòÄ´¤Ù¤¿¤ê¡¢ 2¤Ä¤ÎÈǤòÈæ³Ó¤Ç¤¤ë¤³¤È¤Ç¤¹¡£
ˬÌ䤷¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤ÎÈÇversion¤ò ¤½¤ìÀìÍѤΥХåե¡¤ÇÄ´¤Ù¤ë¡£
¥«¥ì¥ó¥È¥Ð¥Ã¥Õ¥¡¤ÎÆâÍÆ¤È¥Õ¥¡¥¤¥ë¤Î¥Á¥§¥Ã¥¯¥¤¥ó¤·¤¿ºÇ¿·ÈǤȤòÈæ³Ó¤¹¤ë¡£
file¤Î»ØÄꤷ¤¿2¤Ä¤ÎÈǤòÈæ³Ó¤¹¤ë¡£
ɽ¼¨¿§¤òÊѤ¨¤ÆCVS¤ÎÃíµ¥³¥Þ¥ó¥É¤Î·ë²Ì¤òɽ¼¨¤¹¤ë¡£
1¤Ä¤ÎµìÈǤòÄ´¤Ù¤ë¤Ë¤Ï¡¢¥Õ¥¡¥¤¥ë¤òˬÌ䤷¤ÆC-x v ~ version RET
¡Êvc-version-other-window
¡Ë¤ÈÂǤÁ¤Þ¤¹¡£
¤³¤ì¤Ë¤è¤ê¡¢¥Õ¥¡¥¤¥ë¤ÎÈÇversion¤Î¥Æ¥¥¹¥È¤ò
filename.~version~¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤Ë¼ý¤á¡¢
Ê̤Υ¦¥£¥ó¥É¥¦¤Î¤½¤ìÀìÍѤΥХåե¡¤Ç¤½¤Î¥Õ¥¡¥¤¥ë¤òˬÌ䤷¤Þ¤¹¡£
¡ÊRCS¤Ç¤Ï¡¢µìÈǤòÁªÂò¤·¤Æ¡¢¤½¤ì¤«¤é»Þʬ¤«¤ì¤òºîÀ®¤Ç¤¤ë¡£
see Branches¡£¡Ë
¤·¤«¤·Ä̾ï¤Ï¡¢¥³¥Þ¥ó¥ÉC-x v =¡Êvc-diff
¡Ë¤Ç
¥Õ¥¡¥¤¥ë¤Î2¤Ä¤ÎÈǤòÈæ³Ó¤·¤¿¤Û¤¦¤¬¡¢¤â¤Ã¤ÈÊØÍø¤Ç¤¹¡£
°ú¿ô¤ò»ØÄꤷ¤Ê¤¤C-x v =¤Ç¤Ï¡¢¥«¥ì¥ó¥È¥Õ¥¡¥¤¥ë¤ÎÆâÍÆ
¡ÊɬÍפ¬¤¢¤ì¤Ð¥Õ¥¡¥¤¥ë¤ËÊݸ¤¹¤ë¡Ë¤È¥Õ¥¡¥¤¥ë¤Î¥Á¥§¥Ã¥¯¥¤¥ó¤·¤Æ¤¢¤ë
ºÇ¿·ÈǤȤòÈæ³Ó¤·¤Þ¤¹¡£
¿ô°ú¿ô¤ò»ØÄꤷ¤¿C-u C-x v =¤Ç¤Ï¡¢
¥Õ¥¡¥¤¥ë̾¤È2¤Ä¤ÎÈÇÈÖ¹æ¤òÆÉ¤ß¼è¤Ã¤Æ¤«¤é¡¢
»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤Î2¤Ä¤ÎÈǤòÈæ³Ó¤·¤Þ¤¹¡£
ÅÐÏ¿¤·¤¿¥Õ¥¡¥¤¥ë¤Î¤«¤ï¤ê¤Ë¥Ç¥£¥ì¥¯¥È¥ê̾¤ò»ØÄꤹ¤ë¤È¡¢ ¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤È¤½¤Î²¼¤Ë¤¢¤ë¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë ÃÖ¤«¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤ÎÅÐÏ¿¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Î»ØÄꤷ¤¿2¤Ä¤ÎÈǤòÈæ³Ó¤·¤Þ¤¹¡£
¥Á¥§¥Ã¥¯¥¤¥ó¤·¤Æ¤¢¤ëÈǤϡ¢¤½¤ÎÈÖ¹æ¤Ç»ØÄꤷ¤Þ¤¹¡£ ÆþÎϤ¬¶õ¤À¤È¡¢¡Ê¥Á¥§¥Ã¥¯¥¤¥ó¤·¤Æ¤¢¤ëÈǤȤϰۤʤ뤫¤â¤·¤ì¤Ê¤¤¡Ëºî¶È¥Õ¥¡¥¤¥ë¤Î ¸½ºß¤ÎÆâÍÆ¤ò»ØÄꤷ¤Þ¤¹¡£ ÈÇÈÖ¹æ¤Î¤«¤ï¤ê¤Ë¡¢¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È̾¡Êsee Snapshots¡Ë¤ò»ØÄꤹ¤ë¤³¤È¤â ¤Ç¤¤Þ¤¹¡£
¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢ÊÑ¿ôdiff-switches
¤Ç»ØÄꤵ¤ì¤ë¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤Æ¡¢
diff
¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤·¤ÆÆ°ºî¤·¤Þ¤¹¡£
¤½¤Î½ÐÎϤÏÊ̤Υ¦¥£¥ó¥É¥¦¤ÎÆÃÊ̤ʥХåե¡¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£
M-x diff¥³¥Þ¥ó¥É¤È°ã¤Ã¤Æ¡¢C-x v =¤Ç¤Ï¿·ÈǤȵìÈǤÎ
Áê°ã²Õ½ê¤Ë¤Ï°Üư¤Ç¤¤Þ¤»¤ó¡£
¤È¤¤¤¦¤Î¤Ï¡¢Ä̾°ìÊý¤ÎÈÇ¡¢¤¢¤ë¤¤¤Ï¡¢Î¾Êý¤ÎÈǤϡ¢
Èæ³Ó¤¹¤ë¤È¤¤Ë¤Ï¥Õ¥¡¥¤¥ë¤È¤·¤Æ¤Ï¸ºß¤·¤Æ¤¤¤Ê¤¤¤«¤é¤Ç¤¹¡£
¤½¤ì¤é¤Ï¡¢¥Þ¥¹¥¿¥Õ¥¡¥¤¥ë¤ÎµÏ¿¤ÎÃæ¤Ë¸ºß¤¹¤ë¤À¤±¤Ç¤¹¡£
M-x diff¤Ë¤Ä¤¤¤Æ¤è¤ê¾Ü¤·¤¯¤Ï¡¢See Comparing Files¡£
CVS¤Ç´ÉÍý¤·¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Ë´Ø¤·¤Æ¤Ï¡¢ °ìÌܤǤ狼¤ë¤è¤¦¤ËÊ£¿ô¤Îɽ¼¨¿§¤ò»È¤Ã¤Æ¡¢CVSÃíµ¥³¥Þ¥ó¥É¤Î·ë²Ì¤òɽ¼¨¤Ç¤¤Þ¤¹¡£ ¤³¤ì¤Ë¤Ï¡¢M-x vc-annotate¤ò»È¤¤¤Þ¤¹¡£ À֤Ͽ·ÈÇ¡¢ÀĤϵìÈÇ¡¢¤½¤ì¤é¤ÎÃæ´Ö¿§¤ÏÃæ´Ö¤ÎÈǤòɽ¤·¤Þ¤¹¡£ ¿ô°ú¿ôn¤Ï¡¢»þ´Ö¼ÜÅÙ¤ò¿¤Ð¤·¤Þ¤¹¡£ ¤Ä¤Þ¤ê¡¢¤¢¤ëɽ¼¨¿§¤Çɽ¤¹´ü´Ö¤ònÇܤ·¤Þ¤¹¡£