Previous: diff options, Up: diff [Contents][Index]
¼¡¤Î¼Â¹ÔÎã¤Ï¡¢backend.c ¤Î¥ê¥Ó¥¸¥ç¥ó 1.14 ¤È 1.19 ´Ö¤Îº¹Ê¬¤ò¡¢ unidiff ·Á¼° (¥Õ¥é¥° ‘-u’) ¤Ç½ÐÎϤ·¤Þ¤¹¡£ ¤Þ¤¿¥¡¼¥ï¡¼¥ÉÃÖ´¹¤ò»ß¤á¤ë¤¿¤á¤Ë ‘-kk’ ¤ò»ØÄꤷ¡¢ ¥¡¼¥ï¡¼¥ÉÃÖ´¹¤Ë¤è¤ëº¹Ê¬¤ò̵»ë¤·¤Þ¤¹¡£
$ cvs diff -kk -u -r 1.14 -r 1.19 backend.c
¥¿¥° RELEASE_1_0 ¤¬ÉÕ¤±¤é¤ì¤¿¥Õ¥¡¥¤¥ë¤Î½¸¹ç¤«¤é¡¢ ¼Â¸³ÍÑ¤Î»Þ EXPR1 ¤¬ÇÉÀ¸¤·¤Æ¤¤¤ë¤È²¾Äꤷ¤Þ¤¹¡£ ¤³¤Î»Þ¤Ë²Ã¤¨¤é¤ì¤¿Êѹ¹¤ò¸«¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹:
$ cvs diff -r RELEASE_1_0 -r EXPR1
¼¡¤Î¼Â¹ÔÎã¤Ç¤Ï¡¢Æó¤Ä¤Î¥ê¥ê¡¼¥¹´Ö¤Îº¹Ê¬¤ò context ·Á¼°¤Ç½ÐÎϤ·¤Þ¤¹:
$ cvs diff -c -r RELEASE_1_0 -r RELEASE_1_1 > diffs
ChangeLogs ¤ò±¿ÍѤ·¤Æ¤¤¤ë¾ì¹ç¡¢ Êѹ¹¤ò³ÊǼ¤¹¤ëÁ°¤Ë¼¡¤Î¹Ô¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢ ChangeLogs ¤ÎµºÜ»ö¹à¤òÆþÎϤ¹¤ë¤Î¤ËÌòΩ¤Ä¤Ç¤·¤ç¤¦¡£ ºî¶È¥Õ¥¡¥¤¥ë¤Ë²Ã¤¨¤¿Êѹ¹ÅÀ¤Î¤¦¤Á¡¢³ÊǼ¤·¤Æ¤¤¤Ê¤¤¤â¤ÎÁ´¤Æ¤òɽ¼¨¤·¤Þ¤¹¡£
$ cvs diff -u | less