Next: , Up: Comparison   [Contents][Index]


1.1 Hunks

Æó¤Ä¤Î¥Õ¥¡¥¤¥ë¤òÈæ³Ó¤·¤Æ¤¤¤ë¤È¤­¡¤diff¤Ï¡¤hunk¤È¸Æ¤Ð¤ì¤ë °Û¤Ê¤Ã¤Æ¤¤¤ë¹Ô¤Î¤Þ¤È¤Þ¤ê¤¬Á¤é¤Ë¸ºß¤·¤Æ¤¤¤ëξÊý¤Î¥Õ¥¡¥¤¥ë¤«¤é¡¤¶¦ÄÌ¤Ê¹Ô ¤ÎʤӤòõ¤·¤Þ¤¹¡¥Æó¤Ä¤ÎƱ°ì¥Õ¥¡¥¤¥ë¤ÎÈæ³Ó¤Ç¤Ïº¹°Û¤Î¤¢¤ë¹Ô¤Ï̵¤¤¤Î¤Ç¡¤°ì ¤Ä¤Î¶¦Ä̤ʹԤÎʤӤ¬¸«¤Ä¤«¤ê¡¤hunk¤Ï¤¢¤ê¤Þ¤»¤ó¡¥Æó¤Ä¤ÎÁ´¤¯°Û¤Ê¤ë¥Õ¥¡¥¤¥ë ¤ÎÈæ³Ó¤Ç¤Ï¡¤¶¦Ä̤ιԤÏ̵¤¯¡¤Î¾Êý¤Î¥Õ¥¡¥¤¥ë¤Î¤¹¤Ù¤Æ¤Î¹Ô¤ò´Þ¤ó¤Ç¤¤¤ë°ì¤Ä¤Î Â礭¤Êhunk¤¬À¸À®¤µ¤ì¤Þ¤¹¡¥°ìÈÌŪ¤Ë¡¤Æó¤Ä¤ÎÍ¿¤¨¤é¤ì¤¿¥Õ¥¡¥¤¥ë´Ö¤Ç¡¤¹Ô¤Î¥Þ¥Ã ¥Á¤òÄ´¤Ù¤ëÊýË¡¤Ï¤¿¤¯¤µ¤ó¤¢¤ê¤Þ¤¹¡¥diff¤Ï¡¤Â礭¤Ê¶¦Ä̹ԤÎʤӤò õ¤·¤Ê¤¬¤éº¹°Û¤Î¤¢¤ë¹Ô¤ò¾®¤µ¤Êhunk¤Ë¤·¤Æ¡¤Á´ÂΤÎhunk¤ÎÂ礭¤µ¤òºÇ¾®¤Ë¤¹¤ë ¤è¤¦»î¤ß¤Þ¤¹¡¥

Î㤨¤Ð¡¤¥Õ¥¡¥¤¥ëF¤Ï»°¹Ô‘a’¡¤‘b’¡¤‘c’¤ò´Þ¤ó¤Ç¤¤¤Æ¡¤ ¥Õ¥¡¥¤¥ëG¤ÏƱ¤¸¹Ô¤òµÕ¤Î½ç½ø‘c’¡¤‘b’¡¤‘a’¤Ç´Þ¤ó¤Ç¤¤ ¤ë¤È²¾Äꤷ¤Þ¤¹¡¥diff¤¬¹Ô‘c’¤ò¶¦Ä̤Ȥ·¤Æ¸«¤Ä¤±¤¿¾ì¹ç¡¤¥³¥Þ ¥ó¥É‘diff F G’¤Ï°Ê²¼¤Î½ÐÎϤòÀ¸À®¤·¤Þ¤¹¡¥

1,2d0
< a
< b
3a2,3
> b
> a

¤·¤«¤·¡¤¤½¤ÎÂå¤ï¤ê¤Ë¶¦Ä̹ԑb’¤ËÃíÌܤ¹¤ë¾ì¹ç¡¤°Ê²¼¤Î½ÐÎϤòÀ¸À®¤·¤Þ¤¹¡¥

1c1
< a
---
> c
3c3
< c
---
> a

a’¤¬¶¦Ä̹ԤȤ·¤Æ¸«¤Ä¤«¤ë²ÄǽÀ­¤â¤¢¤ê¤Þ¤¹¡¥diff¤Ï¾ï¤Ë¡¤¥Õ¥¡ ¥¤¥ë´Ö¤ÎºÇŬ¤Ê¥Þ¥Ã¥Á¤·¤Æ¤¤¤ëÉôʬ¤ò¸«¤Ä¤±¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡¥¤½¤ì¤Ç¼Â¹Ô ¤¬¤è¤êÁ᤯¤Ê¤ê¤Þ¤¹¡¥¤·¤«¤·¡¤½ÐÎϤÏÄ̾ï²Äǽ¤Ê¸Â¤êû¤¯¤Ê¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡¥ --minimal¥ª¥×¥·¥ç¥ó¤Ç¡¤¤³¤Î¥È¥ì¡¼¥É¥ª¥Õ¤òÄ´À°¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹ (see diff Performance)¡¥