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


10 patch¤òÍѤ¤¤Æ¥Þ¡¼¥¸¤¹¤ë

patch¤Ï¡¤diff¤ÇÀ¸À®¤µ¤ì¤ëÈæ³Ó¤µ¤ì¤¿½ÐÎϤò¼õ¤±¤È¤ê¡¤ ¥Ñ¥Ã¥Á¤ò¤¢¤Æ¤¿¥Ð¡¼¥¸¥ç¥ó¤òÀ¸À®¤·¤Ê¤¬¤é¡¤¥ª¥ê¥¸¥Ê¥ë¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼¤Ëº¹Ê¬ ¤òŬÍѤ·¤Þ¤¹¡¥patch¤òÍѤ¤¤ë¤³¤È¤Ç¡¤¥Õ¥¡¥¤¥ë¤ò¤¹¤Ù¤ÆÇÛÉÛ¤¹¤ëÂå ¤ï¤ê¤Ë¡¤Êѹ¹¤·¤¿¥Õ¥¡¥¤¥ë¤ÎÁȤÀ¤±¤òÇÛÉÛ¤¹¤ë¤³¤È¤¬²Äǽ¤Ë¤Ê¤ê¤Þ¤¹¡¥¼è°úÀè¤Ç ¤Ï¡¤Êѹ¹¤·¤¿¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼¤ò¹¹¿·¤¹¤ë¤¿¤á¤Ëpatch¤òŬÍѤ¹¤ë¤³ ¤È¤¬²Äǽ¤Ë¤Ê¤ê¤Þ¤¹¡¥patch¤Ïº¹Ê¬¤Î½ñ¼°¤ò¼«Æ°Åª¤Ë·èÄꤷ¡¤Á°¸å¤Î ¥Ø¥Ã¥À¤òÈô¤Ð¤·¡¤¥Ñ¥Ã¥Á¤ò¤¢¤Æ¤ë¥Õ¥¡¥¤¥ë¤ò·èÄꤹ¤ë¤¿¤á¤Ë¥Ø¥Ã¥À¤ò»ÈÍѤ·¤Þ¤¹¡¥ ¤³¤ì¤Ç¡¤¼è°úÀè¤Ïpatch¤ËľÀÜ¡¤Êѹ¹Éôʬ¤Î¥ê¥¹¥È¤ò¥á¡¼¥ë¤Î¥á¥Ã¥»¡¼ ¥¸¤Ë´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡¥

patch¤Ï¡¤¸åÌá¤ê¤¹¤ë¥Ñ¥Ã¥Á¤Î¤è¤¦¤Ê°ìÈÌŪ¤ÊÌäÂê¤ò¸¡½Ð¤··Ù¹ð¤òȯ ¤·¤Þ¤¹¡¥¤½¤ì¤ÇŬÍѤ·¤Ê¤¯¤Æ¤â¤è¤¤¥Ñ¥Ã¥Á¤¢¤Æ¤ë¤³¤È¤ò»ß¤á¤Þ¤¹¡¥¤Þ¤¿¡¤¼è°úÀè ¤¬Å¬ÀÚ¤Ê½ç½ø¤Çº¹Ê¬¤òŬÍѤ¹¤ë¤Î¤ò³Î¼Â¤Ë¤¹¤ë¤¿¤á¡¤patchlevel.h¥Õ¥¡ ¥¤¥ë¤â´ÉÍý¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥

patch¤Ï¡¤É¸½àÆþÎϤ«¤éϢ³¤·¤¿º¹Ê¬¤ò¼õ¤±Æþ¤ì¡¤¤½¤ì¤ÏÄ̾¥Ñ¥Ã ¥Á¤ò¤¢¤Æ¤ë¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ë¥Ø¥Ã¥À¤ÇʬΥ¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥¤½¤ì¤Ï¡¤ diff¤Îhunk(see Hunks)¤ò°ì¤Ä¤º¤ÄŬÍѤ·¤Þ¤¹¡¥hunk¤¬¸µ¥Õ¥¡¥¤ ¥ë¤ËÀµ³Î¤Ë¥Þ¥Ã¥Á¤·¤Ê¤¤¾ì¹ç¡¤patch¤Ï¤Ç¤­¤ë¸Â¤êȯ¸«Åª¼êË¡¤òÍѤ¤ ¤Æ¥Ñ¥Ã¥Á¤ò¤¢¤Æ¤ë¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤è¤¦¤È¤·¤Þ¤¹¡¥Å¬Àڤ˥ޥåÁ¤·¤Æ¤¤¤ëÉôʬ¤ò ¸«¤Ä¤±¤ë¤³¤È¤¬ÉÔ²Äǽ¤Ê¾ì¹ç¡¤patch¤Ïhunk¤ò½ü³°¤·¡¤¼¡¤Îhunk¤ËÈô ¤Ó¤Þ¤¹¡¥patch¤ÏÄ̾hunk(¤¬Â¸ºß¤¹¤ë¾ì¹ç¤Ï¤½¤ì)¤ò ‘f.rej’¤Ë¼Î¤Æ¤Ê¤¬¤é¡¤¤½¤ì¤¾¤ì¤Î¥Õ¥¡¥¤¥ëf¤ò¿·¤·¤¤¥Ð¡¼¥¸¥ç ¥ó¤ÇÃÖ´¹¤·¤Þ¤¹¡¥

patch¤Ø¤Î¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ï¡¤See Invoking patch.