Next: , Previous: Incomplete Lines, Up: Top   [Contents][Index]


4 ¥Ç¥£¥ì¥¯¥È¥ê¤ÎÈæ³Ó

Æó¤Ä¤Î¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤Ç¥Õ¥¡¥¤¥ë¤Î¤¤¤¯¤Ä¤«¤Þ¤¿¤Ï¤¹¤Ù¤Æ¤òÈæ³Ó¤¹¤ë¤¿¤á¤Ë¡¤ diff¤ò»ÈÍѤ¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥diff¤Ø¤Î°ú¿ô¤¬Î¾Êý¤È¤â ¥Ç¥£¥ì¥¯¥È¥ê¤Î¤È¤­¡¤Î¾Êý¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤½¤ì¤¾¤ì¤Î¥Õ¥¡¥¤¥ë¤ò¡¤ LC_COLLATE¥í¥±¡¼¥ë¥«¥Æ¥´¥ê¤Ç»ØÄꤵ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¡¤¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç ¤ËÈæ³Ó¤·¤Þ¤¹¡¥Ä̾ïdiff¤Ï¡¤º¹°Û¤Î̵¤¤¥Õ¥¡¥¤¥ë¤ÎÁȤËÂФ·¤Æ¤Ï²¿¤â ½ÐÎϤ·¤Þ¤»¤ó¤¬¡¤-s¤ä--report-identical-files¥ª¥×¥·¥ç¥ó ¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¡¤Æ±°ì¥Õ¥¡¥¤¥ë¤ÎÁȤâÊó¹ð¤·¤Þ¤¹¡¥Ä̾ïdiff¤Ï¡¤ ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ÎÈæ³Ó¤ò¹Ô¤Ê¤ï¤º¡¤Î¾Êý¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¶¦Ä̤Υµ¥Ö¥Ç¥£¥ì¥¯ ¥È¥ê¤Ë¤Ä¤¤¤ÆÊó¹ð¤·¤Þ¤¹¤¬¡¤-r¤ä--recursive¥ª¥×¥·¥ç¥ó¤ò »ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¡¤²Äǽ¤Ê¸Â¤ê¿¼¤¤¥ì¥Ù¥ë¤Þ¤Ç¡¤¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤ÎÂбþ¤¹¤ë ¥Õ¥¡¥¤¥ë¤ÎÁȤ´¤È¤ËÈæ³Ó¤ò¤·¤Þ¤¹¡¥

°ìÊý ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤À¤±¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë̾¤ËÂФ·¤Æ¡¤diff¤ÏÄ̾ ¸ºß¤¹¤ë¥Õ¥¡¥¤¥ë¤ÎÆâÍÆ¤òɽ¼¨¤·¤Þ¤»¤ó¡¥¥Õ¥¡¥¤¥ë¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ë¸ºß¤·¡¤¤â ¤¦°ìÊý¤Ë¤Ï¸ºß¤·¤Ê¤¤¤³¤È¤À¤±¤òÊó¹ð¤·¤Þ¤¹¡¥¼ÂºÝ¤Ë¸ºß¤¹¤ë¥Õ¥¡¥¤¥ë¤ÎÆâÍÆÁ´ Éô¤ò½ÐÎϤ¹¤ë¤è¤¦¤Ë¡¤¤â¤¦°ìÊý¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥Õ¥¡¥¤¥ë¤Ï¸ºß¤¹¤ë¤¬¶õ¤Î¥Õ¥¡ ¥¤¥ë¤Ç¤¢¤ë¤«¤Î¤è¤¦¤Ë¡¤diff¤Ëưºî¤µ¤»¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡¥(³ºÅö¤¹ ¤ë¤â¤Î¤¬ºÇ½é¤Þ¤¿¤ÏÆóÈÖÌܤΥǥ£¥ì¥¯¥È¥ê¤Ë¤¢¤ë¤«¤É¤¦¤«¤Ë°Í¸¤·¤Æ¡¤ÁÞÆþ¤Þ¤¿ ¤Ïºï½ü¤È¤·¤Æ½ÐÎϤ·¤Þ¤¹¡¥)¤³¤¦¤¹¤ë¤¿¤á¤Ë¡¤-N¤ä --new-file¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡¥

¸Å¤¤¥Ç¥£¥ì¥¯¥È¥ê¤Ë°ì¤Ä°Ê¾å¤ÎÂ礭¤Ê¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¡¤¿·¤·¤¤¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï ̵¤¤¾ì¹ç¡¤-N¤ÎÂå¤ï¤ê¤Ë--unidirectional-new-file¤ò»ÈÍÑ ¤¹¤ë¤³¤È¤Ç¡¤¥Ñ¥Ã¥Á¤ò¤è¤ê¾®¤µ¤¯¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï -N¤Ë»÷¤Æ¤¤¤Þ¤¹¤¬¡¤ºÇ½é¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï̵¤¯ÆóÈÖÌܥǥ£¥ì¥¯¥È¥ê ¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë(¤¹¤Ê¤ï¤Á¡¤Äɲ䵤줿¥Õ¥¡¥¤¥ë)¤ÎÆâÍÆ¤À¤±¤òÁÞÆþ¤·¤Þ¤¹¡¥¥Ñ¥Ã ¥Á¤ÎºÇ½é¤Ë¡¤¥æ¡¼¥¶¤¬Å¬ÍѤ¹¤ë¥Ñ¥Ã¥Á¤Ç¡¤¥Ñ¥Ã¥Á¤òŬÍѤ¹¤ëÁ°¤Ëºï½ü¤µ¤ì¤¿¥Õ¥¡ ¥¤¥ë¤òºï½ü¤¹¤ë¤è¤¦¤ËÌ¿Îá¤ò½ñ¤¤¤Æ¤¯¤À¤µ¤¤¡¥ÇÛÉÛʪ¤Ø¤Î¥Ñ¥Ã¥Á¤òºîÀ®¤¹¤ëµÄÏÀ ¤Ï¡¤See Making Patches.

¥Ç¥£¥ì¥¯¥È¥ê¤òÈæ³Ó¤·¤Æ¤¤¤ë´Ö¤Ë¤¤¤¯¤Ä¤«¤Î¥Õ¥¡¥¤¥ë¤ò̵»ë¤¹¤ë¤¿¤á¤Ë¡¤ -x pattern¤ä--exclude=pattern¥ª¥×¥·¥ç¥ó¤ò »ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡¥¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¡¤¥·¥§¥ë¤Î¥Ñ¥¿¡¼¥ópattern¤Ë¥Þ¥Ã ¥Á¤¹¤ë¥Ù¡¼¥¹Ì¾¤Î¥Õ¥¡¥¤¥ë¤ä¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò̵»ë¤·¤Þ¤¹¡¥¥·¥§¥ë¤È¤Ï°Û¤Ê¤ê¡¤ ¥Õ¥¡¥¤¥ë̾¤Î¥Ù¡¼¥¹¤ÎºÇ½é¤Î¥Ô¥ê¥ª¥É¤Ï¥Ñ¥¿¡¼¥ó¤ÎºÇ½é¤Î¥ï¥¤¥ë¥É¥«¡¼¥É¤Ë¥Þ¥Ã ¥Á¤·¤Þ¤¹¡¥¥·¥§¥ë¤¬Å¸³«¤·¤Ê¤¤¤è¤¦¤Ë¡¤pattern¤ò°úÍÑÉä¤Ç°Ï¤à¤Ù¤­¤Ç¤¹¡¥ Î㤨¤Ð¡¤¥ª¥×¥·¥ç¥ó-x '*.[ao]'¤Ç¡¤‘.a’¤ä‘.o’¤Ç½ª¤ë̾Á° ¤Î¥Õ¥¡¥¤¥ë¤ò̵»ë¤·¤Þ¤¹¡¥

¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï°ì²ó°Ê¾å»ØÄꤷ¤¿¾ì¹ç¤ÏÎßÀѤµ¤ì¤Þ¤¹¡¥Î㤨¤Ð¡¤¥ª¥×¥·¥ç¥ó -x 'RCS' -x '*,v'¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¡¤¥Ù¡¼¥¹Ì¾¤¬‘RCS’¤Þ¤¿¤Ï ‘,v’¤Ç½ª¤ë¥Õ¥¡¥¤¥ë¤ä¥Ç¥£¥ì¥¯¥È¥ê¤ò̵»ë¤·¤Þ¤¹¡¥

¤³¤Î¥ª¥×¥·¥ç¥ó¤ò²¿²ó¤âÍ¿¤¨¤ëɬÍפ¬¤¢¤ë¾ì¹ç¡¤¤½¤ÎÂå¤ï¤ê¤Ë¥Ñ¥¿¡¼¥ó¤ò¥Õ¥¡¥¤ ¥ë¤Ë½ñ¤­¡¤-X file¤ä--exclude-from=file¥ª¥× ¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥

Æó¤Ä¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òÈæ³Ó¤·¤Æ¤¤¤ÆÅÓÃæ¤ÇÄä»ß¤·¤¿¾ì¹ç¡¤¤½¤Î¸å¤Ç»Ä¤ê¤ò³¤±¤¿ ¤¤¤³¤È¤â¤¢¤ë¤Ç¤·¤ç¤¦¡¥-S file¤ä --starting-file=file¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¡¤¤½¤ì¤¬²Ä ǽ¤Ç¤¹¡¥¤³¤ì¤Ç¡¤ºÇ¾å°Ì¥ì¥Ù¥ë¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¡¤¥Õ¥¡¥¤¥ëfile¤È¥¢¥ë¥Õ¥¡ ¥Ù¥Ã¥È½ç¤Ç¤½¤ì°Ê¹ß¤Î¥Õ¥¡¥¤¥ë¤À¤±¤òÈæ³Ó¤·¤Þ¤¹¡¥

Æó¤Ä¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¡¤¥Õ¥¡¥¤¥ë̾¤¬°ìÊý¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¾®Ê¸»ú¤Ç¡¤¤â¤¦°ì Êý¤Ç¤ÏÂçʸ»ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤È¤¤¤¦º¹¤·¤«¤Ê¤¤¾ì¹ç¡¤diff¤ÏÄ̾Âçʸ »ú¾®Ê¸»ú¤ò¶èÊ̤·¤Æ¥Õ¥¡¥¤¥ë̾¤òÈæ³Ó¤¹¤ë¤Î¤Ç¡¤Â¿¤¯¤Îº¹°Û¤òÊó¹ð¤·¤Þ¤¹¡¥ --ignore-file-name-case¥ª¥×¥·¥ç¥ó¤òÍѤ¤¤ë¤È¡¤Î㤨¤Ð°ìÊý¤Î¥Ç¥£¥ì ¥¯¥È¥ê¤Î¥Õ¥¡¥¤¥ëTao¤ÎÆâÍÆ¤È¡¤¤â¤¦°ìÊý¤Î¥Õ¥¡¥¤¥ëTAO¤ÎÆâÍÆ¤ò Èæ³Ó¤¹¤ë¤è¤¦¤Ë¡¤diff¤Ï¥Õ¥¡¥¤¥ë̾¤ÎÂçʸ»ú¾®Ê¸»ú¤ò̵»ë¤·¤Þ¤¹¡¥ --no-ignore-file-name-case¥ª¥×¥·¥ç¥ó¤Ç¡¤ --ignore-file-name-case¥ª¥×¥·¥ç¥ó¤Î¸ú²Ì¤òÄä»ß¤·¡¤¥Ç¥Õ¥©¥ë¥È¤Îư ºî¤ËÌá¤ê¤Þ¤¹¡¥

--ignore-file-name-case¤¬¸ú²Ì¤¬¤¢¤ë¤È¤­¤Ë¡¤-x pattern¡¤--exclude=pattern¡¤-X file¡¤ ¤Þ¤¿¤Ï--exclude-from=file¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¤ »ØÄꤵ¤ì¤Æ¤¤¤ë¥Ñ¥¿¡¼¥ó¤Ë¥Þ¥Ã¥Á¤·¤¿¥Õ¥¡¥¤¥ë̾¤ò½ü³°¤¹¤ë¤È¤­¡¤Âçʸ»ú¾®Ê¸»ú ¤ò̵»ë¤·¤Þ¤¹¡¥