Next: Generating Smaller Patches, Previous: Tips for Patch Consumers, Up: Making Patches [Contents][Index]
Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤Î¥Ñ¥Ã¥Á¤òÀ¸À®¤·¤Æ¤¤¤ë¤È¤¡¤diff
¤Ï¥¹¥é¥Ã¥·¥å¤Î̵
¤¤¥Ç¥£¥ì¥¯¥È¥ê̾¤ËŬÍѤ·¤Þ¤¹¡¥¤³¤¦¤¹¤ë¤³¤È¤Ç¡¤¥Ñ¥Ã¥Á¤ÎÍøÍѼԤ¬
-pnumber¤ò»ØÄꤷ¤Æ¤¤¤ë¤È¤º®Í𤬾¯¤Ê¤¯¤Ê¤ê¡¤¤½¤ì¤Ï¡¤¤³¤Î
¥ª¥×¥·¥ç¥ó¤Ç¸Å¤¤¤â¤Î¤È¿·¤·¤¤¤â¤Î¤Î¥Õ¥¡¥¤¥ë̾¤Ç¥¹¥é¥Ã¥·¥å¤Î¿ô¤¬°Û¤Ê¤ë¾ì¹ç¡¤
¤Ó¤Ã¤¯¤ê¤¹¤ë¤è¤¦¤Ê·ë²Ì¤Ë¤Ê¤ë¤¿¤á¤Ç¤¹¡¥Î㤨¤Ð¡¤°Ê²¼¤Î¤è¤¦¤Ê¥Ø¥Ã¥À¤ò»ý¤Ä¥Ñ¥Ã
¥Á¤òÁ÷¤é¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡¥
diff -Naur v2.0.29/prog/README prog/README --- v2.0.29/prog/README 2002-03-10 23:30:39.942229878 -0800 +++ prog/README 2002-03-17 20:49:32.442260588 -0800
¤½¤ÎÍýͳ¤Ï¡¤Æó¤Ä¤Î¥Õ¥¡¥¤¥ë̾¤Î¥¹¥é¥Ã¥·¥å¤Î¿ô¤¬°Û¤Ê¤Ã¤Æ¤¤¤Æ¡¤°Û¤Ê¤ë¥Ð¡¼¥¸¥ç
¥ó¤Îpatch
¤Ç¤Ï¡¤¥Õ¥¡¥¤¥ë̾¤¬°Û¤Ê¤Ã¤Æ¤¤¤ë¤È²ò¼á¤¹¤ë¤¿¤á¤Ç¤¹¡¥º®
Íð¤òÈò¤±¤ë¤¿¤á¡¤¤½¤ÎÂå¤ï¤ê¤Ë°Ê²¼¤Î¤è¤¦¤Ê½ÐÎϤòÁ÷¤Ã¤Æ¤¯¤À¤µ¤¤¡¥
diff -Naur v2.0.29/prog/README v2.0.30/prog/README --- v2.0.29/prog/README 2002-03-10 23:30:39.942229878 -0800 +++ v2.0.30/prog/README 2002-03-17 20:49:32.442260588 -0800
¼þ¤ê¤Îʸ¤ò»ÈÍѤ·¤¿º¹Ê¬¤Î¥Ø¥Ã¥À¤ä‘Index:’¹Ô¤Ç¡¤Àµ¤·¤¯¥Õ¥¡¥¤¥ë̾¤ò»Ø Äꤷ¤Æ¤¤¤ë¤³¤È¤ò³Î¤«¤á¤Æ¤¯¤À¤µ¤¤¡¥´û¤Ë¥Ñ¥Ã¥Á¤òÅö¤Æ¤¿¤«¤É¤¦¤«ÉԻ׵Ĥ˻פ¦ ¤Î¤Ç¡¤¥ê¥Ð¡¼¥¹¥Ñ¥Ã¥Á¤òÁ÷¤é¤Ê¤¤¤è¤¦¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡¥
README.orig¤äREADME~¤Î¤è¤¦¤Ê¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë̾¤ÈÈæ³Ó¤·
¤Æ¤¤¤ë¥Ñ¥Ã¥Á¤Ï¡¤patch
¤¬ËÜÅö¤Î¥Õ¥¡¥¤¥ë¤ÎÂå¤ï¤ê¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡
¥¤¥ë¤Ë¥Ñ¥Ã¥Á¤òÅö¤Æ¤è¤¦¤È¤·¤Æº®Í𤹤ë¤Î¤Ç¡¤¤½¤Î¤è¤¦¤Ê¥Ñ¥Ã¥Á¤òÁ÷¤ë¤³¤È¤òÈò
¤±¤Æ¤¯¤À¤µ¤¤¡¥¤½¤ÎÂå¤ï¤ê¤Ë¡¤°Û¤Ê¤ë¥Ç¥£¥ì¥¯¥È¥ê¡¤Î㤨¤Ðold/README
¤Ènew/README¤Î¤è¤¦¤Ë¡¤Æ±¤¸¥Ù¡¼¥¹¥Õ¥¡¥¤¥ë̾¤ÇÈæ³Ó¤·¤¿¥Ñ¥Ã¥Á¤òÁ÷¤Ã
¤Æ¤¯¤À¤µ¤¤¡¥
°ÊÁ°¤ËÁ÷¤é¤ì¤¿Â¾¤Î¥Ñ¥Ã¥Á¤ò¼ÂºÝ¤ËŬÍѤ·¤Æ¤¤¤ë¿Í¤òÊݸ¤ë¤¿¤á¤Ë¡¤¥Ñ¥Ã¥Á¥Õ¥¡
¥¤¥ë¤ÎºÇ½é¤Î¥Ñ¥Ã¥Á¤Ë¡¤¥Ñ¥Ã¥Á¥ì¥Ù¥ë¤ä¥Ð¡¼¥¸¥ç¥ó¥Ê¥ó¥Ð¡¼¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë
patchlevel.h¤äversion.c¤Î¤è¤¦¤Ê̾Á°¤Ç¥Õ¥¡¥¤¥ë¤ò¹¹¿·¤µ¤»¤ë
¤³¤È¤¬²Äǽ¤Ç¤¹¡¥ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ë´Ö°ã¤Ã¤¿¥Ð¡¼¥¸¥ç¥ó¥Ê¥ó¥Ð¡¼¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì
¹ç¡¤patch
¤Ï¤¹¤°¤Ëʸ¶ç¤ò¤¤¤¤¤Þ¤¹¡¥
¤³¤ÎÌäÂê¤òÈò¤±¤ë¤è¤êÌÀ³Î¤ÊÊýË¡¤Ï¡¤¥Ñ¥Ã¥Á¤ÎÁ°¤Ë‘Prereq:’¹Ô¤ò½ñ¤¯¤³¤È
¤Ç¤¹¡¥¥Ñ¥Ã¥Á¥Õ¥¡¥¤¥ë¤ËÁ°ÃÖ¤µ¤ì¤ë¥Æ¥¥¹¥È¤Ë‘Prereq:’¤Ç»Ï¤Þ¤ë¹Ô¤¬´Þ¤Þ
¤ì¤Æ¤¤¤ë¾ì¹ç¡¤patch
¤Ï¤½¤Î¹Ô¤Î¼¡¤Îñ¸ì(Ä̾ï¤Ï¥Ð¡¼¥¸¥ç¥ó¥Ê¥ó¥Ð¡¼)
¤ò¼õ¤±¤È¤ê¡¤¼¡¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤Ë¶õÇò¤ä²þ¹Ô¤¬Á°¸å¤Ë¤¢¤ëñ¸ì¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¤«
¤É¤¦¤«Ä´ºº¤·¤Þ¤¹¡¥¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¤patch
¤Ï½èÍý¤¹¤ëÁ°¤Ë³Îǧ¤¹
¤ë¤¿¤á¤Î¥×¥í¥ó¥×¥È¤ò½Ð¤·¤Þ¤¹¡¥¤³¤ì¤Ç´Ö°ã¤Ã¤¿½ç½ø¤Ç¥Ñ¥Ã¥Á¤ò¶öÁ³¤Ë¤âŬÍѤ¹
¤ë¤³¤È¤¬Æñ¤·¤¯¤Ê¤ê¤Þ¤¹¡¥