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


³µÍ×

¥³¥ó¥Ô¥å¡¼¥¿¥æ¡¼¥¶¤Ï¡¤Æó¤Ä¤Î¥Õ¥¡¥¤¥ë¤Îº¹¤¬¤É¤ì¤¯¤é¤¤¤¢¤ë¤Î¤«¿Ò¤Í¤ë¤³¤È¤¬ ¿¤¤¤³¤È¤òÃΤäƤ¤¤Þ¤¹¡¥¤ª¤½¤é¤¯°ì¤Ä¤Î¥Õ¥¡¥¤¥ë¤Ï¡¤¤â¤¦°ì¤Ä¤Î¥Õ¥¡¥¤¥ë¤Î¤è ¤ê¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Ç¤·¤ç¤¦¡¥¤â¤·¤«¤¹¤ë¤È¡¤Æó¤Ä¤Î¥Õ¥¡¥¤¥ë¤ÏºÇ½é¤ÏƱ°ì¤Î¤â ¤Î¤À¤Ã¤¿¤Î¤Ç¤¹¤¬¡¤ÊÌ¡¹¤Î¿Í¤¬Êѹ¹¤·¤¿¤â¤Î¤«¤â¤·¤ì¤Þ¤»¤ó¡¥

Æó¤Ä¤Î¥Õ¥¡¥¤¥ë¤ä¡¤Æó¤Ä¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤½¤ì¤¾¤ìÂбþ¤¹¤ë¥Õ¥¡¥¤¥ë¤Îº¹¤òɽ¼¨ ¤¹¤ë¤¿¤á¤Ë¡¤diff¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥ diff¤Ï¡¤¹Ôñ°Ì¤Ç¤Î¥Õ¥¡¥¤¥ë´Ö¤Îº¹¤ò¡¤¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÇÁªÂò²Äǽ¤Ê ¤¤¤¯¤Ä¤«¤Î½ñ¼°¤Ç½ÐÎϤ·¤Þ¤¹¡¥¤³¤Îº¹¤ÎÁȤϺ¹Ê¬(diff)¤ä¥Ñ¥Ã¥Á (patch)¤È¸Æ¤Ð¤ì¤ë¤³¤È¤â¤è¤¯¤¢¤ê¤Þ¤¹¡¥Æ±°ì¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¡¤Ä̾ï diff¤Ï²¿¤â½ÐÎϤ·¤Þ¤»¤ó¡¥¥Ð¥¤¥Ê¥ê(¥Æ¥­¥¹¥È¤Ç¤Ê¤¤)¥Õ¥¡¥¤¥ë¤ËÂФ· ¤Æ¡¤Ä̾ïdiff¤Ï¤½¤ì¤é¤¬°Û¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤À¤±¤òÊó¹ð¤·¤Þ¤¹¡¥

Æó¤Ä¤Î¥Õ¥¡¥¤¥ë¤Îº¹¤¬¤¢¤ë¾ì½ê¤Î¥ª¥Õ¥»¥Ã¥È¤È¹ÔÈÖ¹æ¤òɽ¼¨¤¹¤ë¤¿¤á¤Ë¡¤ cmp¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥cmp¤Ç¤Ï¡¤Æó¤Ä¤Î ¥Õ¥¡¥¤¥ë´Ö¤Ç°Û¤Ê¤Ã¤Æ¤¤¤ëÁ´¤Æ¤Îʸ»ú¤òʤ٤ÆÉ½¼¨¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡¥Æó¤Ä¤Î ¥Õ¥¡¥¤¥ë¤òʸ»úñ°Ì¤ÇÈæ³Ó¤¹¤ë¤â¤¦°ì¤Ä¤ÎÊýË¡¤È¤·¤Æ¤Ï¡¤Emacs¥³¥Þ¥ó¥É¤Î M-x compare-windows¤¬¤¢¤ê¤Þ¤¹¡¥¤½¤Î¥³¥Þ¥ó¥É¤Î¾ÜºÙ¤Ï¡¤See Other Window in The GNU Emacs Manual.

»°¤Ä¤Î¥Õ¥¡¥¤¥ë´Ö¤Îº¹¤òɽ¼¨¤¹¤ë¤¿¤á¤Ëdiff3¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ë¤³ ¤È¤¬²Äǽ¤Ç¤¹¡¥Æó¿Í¤Î¿Í¤¬¶¦Ä̤Υª¥ê¥¸¥Ê¥ë¤Ë¸ÄÊ̤ÎÊѹ¹¤ò¹Ô¤Ê¤Ã¤¿¤È¤­¡¤ diff3¤Ç¥ª¥ê¥¸¥Ê¥ë¤ÈÆó¤Ä¤ÎÊѹ¹¤µ¤ì¤¿¥Ð¡¼¥¸¥ç¥ó¤Îº¹¤òÊó¹ð¤µ¤»¤ë ¤³¤È¤¬²Äǽ¤Ç¡¤¾×ÆÍ¤·¤Æ¤¤¤ë¤È¤¤¤¦·Ù¹ð¤òÍѤ¤¤Ê¤¬¤é¡¤Î¾¼Ô¤ÎÊѹ¹¤ò¤½¤ì¤¾¤ì´Þ ¤á¤Æ¤¤¤ë¥Þ¡¼¥¸¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤òÀ¸À®¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥

Æó¤Ä¤Î¥Õ¥¡¥¤¥ë¤òÂÐÏÃŪ¤Ë¥Þ¡¼¥¸¤¹¤ë¤¿¤á¤Ësdiff¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹ ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥

(¥×¥í¥°¥é¥à¤Î¥½¡¼¥¹¥³¡¼¥É¤Î¤è¤¦¤Ê)¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤Ø¤Î¹¹¿·¤ò¾¤Î¿Í¤ËÇÛÉÛ ¤¹¤ë¤¿¤á¤Ë¡¤diff¤ÇÀ¸À®¤µ¤ì¤¿º¹Ê¬¤ÎÁȤò»ÈÍѤ¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥ Èæ³Ó¤·¤¿¥Õ¥¡¥¤¥ë¤Îº¹¤¬¾®¤µ¤¤¤È¤­¡¤¤³¤Î¼êË¡¤ÏÆÃ¤ËÌò¤ËΩ¤Á¤Þ¤¹¡¥ diff½ÐÎϤòÍ¿¤¨¤ë¤³¤È¤Ç¡¤¹¹¿·¤¹¤ë¤¿¤á¤Îpatch¥×¥í¥°¥é ¥à¤ò»ÈÍѤ·¤¿¤ê¡¤¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼¤òpatch¤Ë¤·¤¿¤ê¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥ diff¤È¤Ïº¹Ê¬¤òÀ¸À®¤¹¤ë¤¿¤á¤Ë°ì¤Ä¤Î¥Õ¥¡¥¤¥ë¤«¤é¤â¤¦°ì¤Ä¤Î¥Õ¥¡¥¤ ¥ë¤ò°ú¤¯¤³¤È¤À¤È¹Í¤¨¤ë¾ì¹ç¡¤patch¤È¤Ï¡¤¤â¤¦°ì¤Ä¤Î¤â¤Î¤òºÆÀ¸À® ¤¹¤ë¤¿¤á¤Ëº¹Ê¬¤ò°ì¤Ä¤Î¥Õ¥¡¥¤¥ë¤Ë²Ã¤¨¤ë¤³¤È¤À¤È¹Í¤¨¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥

¤³¤Î¥Þ¥Ë¥å¥¢¥ë¤ÎºÇ½é¤Ç¤Ïº¹Ê¬¤ÎºîÀ®¤Ë½¸Ã椷¡¤¤½¤Î¸å¤Ç¥Õ¥¡¥¤¥ë¤ò¹¹¿·¤¹¤ë¤¿ ¤á¤Ëº¹Ê¬¤ò»ÈÍѤ¹¤ëÊýË¡¤òÄ󼨤·¤Þ¤¹¡¥

GNU diff¤Ï¡¤Paul Eggert¡¤Mike Haertel¡¤David Hayes¡¤ Richard Stallman¡¤¤½¤·¤ÆLen Tower¤Ë¤è¤Ã¤Æ½ñ¤«¤ì¤Þ¤·¤¿¡¥Wayne Davison¤Ï¡¤ °ìÂ⽤·¤¿½ÐÎϽñ¼°¤òÀ߷פ·¼ÂÁõ¤·¤Þ¤·¤¿¡¥´ðËÜŪ¤Ê¥¢¥ë¥´¥ê¥º¥à¤Ï¡¤“An O(ND) Difference Algorithm and its Variations”, Eugene W. Myers, Algorithmica Vol. 1 No. 2, 1986, pp. 251–266¤È¡¤“A File Comparison Program”, Webb Miller and Eugene W. Myers, Software—Practice and Experience Vol. 15 No. 11, 1985, pp. 1025–1040¤Ëµ­½Ò¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥ ¥¢¥ë¥´¥ê¥º¥à¤Ï¡¤“Algorithms for Approximate String Matching”, E. Ukkonen, Information and Control Vol. 64, 1985, pp. 100–118¤Ëµ­½Ò¤µ¤ì¤Æ¤¤¤ë¤â¤Î¤Ë°Í¸¤·¤Ê¤¤¤è¤¦¤Ë¤·¤ÆÈ¯ÌÀ¤µ¤ì¤Þ¤·¤¿¡¥

GNU diff3¤ÏRandy Smith¤Ë¤è¤Ã¤Æ½ñ¤«¤ì¤Þ¤·¤¿¡¥GNU sdiff¤ÏThomas Lord¤Ë¤è¤Ã¤Æ½ñ¤«¤ì¤Þ¤·¤¿¡¥GNU cmp ¤ÏTorbjorn Granlund¤ÈDavid MacKenzie¤Ë¤è¤Ã¤Æ½ñ¤«¤ì¤Þ¤·¤¿¡¥

patch¤ÏLarry Wall¤ÈPaul Eggert¤Ë¤è¤Ã¤Æ½ñ¤«¤ì¤Þ¤·¤¿¡¥¤¤¤¯¤Ä¤«¤Î GNU¤Î³ÈÄ¥Éôʬ¤ÏWayne Davison¤ÈDavid MacKenzie¤¬´ó£¤·¤Æ¤¯¤ì¤Þ¤·¤¿¡¥ ¤³¤Î¥Þ¥Ë¥å¥¢¥ë¤Î°ìÉô¤Ï¡¤Larry Wall¤Ë¤è¤Ã¤Æ½ñ¤«¤ì¤¿¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤òŬÍÑ ¤·¤Æ¤¤¤Æ¡¤¤½¤ì¤Ë¤ÏÈà¤Îµö²Ä¤¬Éտ路¤Æ¤¤¤Þ¤¹¡¥