Previous: Avoiding Common Mistakes, Up: Making Patches   [Contents][Index]


11.4 ¤è¤ê¾®¤µ¤¤¥Ñ¥Ã¥Á¤òÀ¸À®¤¹¤ë

¥Ñ¥Ã¥Á¤òÀ¸À®¤¹¤ëºÇ¤âñ½ã¤ÊÊýË¡¤Ï‘diff -Naur’¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¤¹¤¬ (see Tips for Patch Producers)¡¤¥Ñ¥Ã¥Á¤òºîÀ®¤¹¤ëÁ°¤Ë¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò Êѹ¹¤·¤¿¤êºï½ü¤·¤¿¤ê¤¹¤ë¤³¤È¤Ç¡¤¥Ñ¥Ã¥Á¤ÎÂ礭¤µ¤ò¾®¤µ¤¯¤¹¤ë¤³¤È¤â²Äǽ¤«¤â ¤·¤ì¤Þ¤»¤ó¡¥¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ï¤Ê¤¤¥Õ¥¡¥¤¥ë ¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¤ä¡¤Æó¤Ä¤Î¥Ð¡¼¥¸¥ç¥ó´Ö¤Ç̾Á°¤¬Êѹ¹¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¤¥Ñ¥Ã ¥Á¤òŬÍѤ¹¤ëÁ°¤Ë¡¤¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¥æ¡¼¥¶¤¬¼Â¹Ô¤¹¤ë rm¤Èmv¤Î¥ê¥¹¥È¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡¥¤½¤·¤Æ¤³¤ì¤é¤Î¥³¥Þ ¥ó¥É¤ò¥¹¥¯¥é¥Ã¥Á¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡¥

¾¤Î¥Õ¥¡¥¤¥ë¤«¤éÍÆ°×¤ËºÆ¹½À®²Äǽ¤À¤È¤¤¤¦Íýͳ¤«¤é(Î㤨¤Ð¡¤TAGS¤È yacc¤Èmakeinfo¤«¤é¤Î½ÐÎÏ)¡¤¥Ñ¥Ã¥Á¤ò´Þ¤á¤ëɬÍפ¬¤Ê¤¤ ¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ë¾ì¹ç¡¤diff¤Ë-x pattern¥ª¥×¥·¥ç ¥ó(see Comparing Directories)¤ÇÆÀ¤é¤ì¤ë¥Ñ¥Ã¥Á¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡¥¥Ñ¥Ã ¥ÁÍøÍѼԤ¬¥Ó¥ë¥É¤¹¤ë¥Ä¡¼¥ë¤¬Ìµ¤¤¤¿¤á¡¤¥Ñ¥Ã¥Á¤ÇÇÉÀ¸¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤¿¤¯¤Ê ¤¤¾ì¹ç¡¤¥Ñ¥Ã¥ÁÍøÍѼԤΥ¿¥¤¥à¥¹¥¿¥ó¥×¤Çmake¤¬º®Í𤷤ʤ¤¤è¤¦¤Ë¡¤ ÇÉÀ¸¥Õ¥¡¥¤¥ë¤Î¥Ñ¥Ã¥Á¤¬¤½¤ì¤Ë°Í¸¤¹¤ë¥Õ¥¡¥¤¥ë¤Ë¥Ñ¥Ã¥Á¤òÅö¤Æ¤Ê¤¤¤³¤È¤ò³Î¤« ¤á¤Æ¤¯¤À¤µ¤¤¡¥

¤µ¤Æ¡¤‘diff -Naur’¤ò»ÈÍѤ·¤Æ¥Ñ¥Ã¥Á¤òºîÀ®¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥¥¹¥¯¥é¥Ã ¥Á¥Ç¥£¥ì¥¯¥È¥ê¤òºÇ½é¤Ë¡¤¿·¤·¤¤¥Ç¥£¥ì¥¯¥È¥ê¤òÆóÈÖÌܤ˻ØÄꤷ¤Æ¤¤¤ë¤³¤È¤ò³Î ¤«¤á¤Æ¤¯¤À¤µ¤¤¡¥

¥Ñ¥Ã¥Á¤ÎºÇ½é¤Ë¡¤¥Ñ¥Ã¥Á¤òŬÍѤ¹¤ëÁ°¤Ë¥æ¡¼¥¶¤Ërm¤Èmv¥³ ¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤è¤¦¤ËÅÁ¤¨¤ë¥á¥â¤ò½ñ¤¤¤Æ¤¯¤À¤µ¤¤¡¥¤ä¤Ã¤È¡¤¥¹¥¯¥é¥Ã¥Á¥Ç¥£ ¥ì¥¯¥È¥ê¤òºï½ü¤Ç¤­¤Þ¤¹¡¥

¼þ¤ê¤Îʸ¤Î»ÈÍѤò¤è¤ê¾®¤µ¤¯¤¹¤ë¤³¤È¤Ç¥Ñ¥Ã¥Á¤ÎÂ礭¤µ¤ò¾®¤µ¤¯¤¹¤ë¤³¤È¤â²Äǽ ¤Ç¤¹¤¬¡¤¥Ñ¥Ã¥Á¤¬ÆþÎϹԤËÀµ³Î¤Ë¥Þ¥Ã¥Á¤·¤Ê¤¤¤È¤­¡¤Å¬ÀڤʽèÍý¤ò¹Ô¤Ê¤¦¤¿¤á¡¤ patch¤ÏÄ̾ºÇÄãÆó¹ÔɬÍפÀ¤È¤¤¤¦¤³¤È¤ò³Ð¤¨¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡¥