Next: , Previous: Creating and Removing, Up: Merging with patch   [Contents][Index]


10.5 ¥Ñ¥Ã¥Á¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¹¹¿·

patch¤¬¥Õ¥¡¥¤¥ë¤ò¹¹¿·¤¹¤ë¤È¤­¡¤Ä̾ï¥Õ¥¡¥¤¥ë¤ÎºÇ½ª¹¹¿·¤Î¥¿¥¤¥à ¥¹¥¿¥ó¥×¤ò¸½ºß¤ÎÆü»þ¤ËÀßÄꤷ¤Þ¤¹¡¥¥½¥Õ¥È¥¦¥¨¥¢ÇÛÉÛʪ¤ÎÄÉÀ×¤Ë patch¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¡¤¤³¤ì¤Çmake¤Ï¡¤¥Ñ¥Ã¥Á¤ò¤¢¤Æ ¤¿¥Õ¥¡¥¤¥ë¤¬¸Å¤¤¤â¤Î¤À¤È´Ö°ã¤Ã¤Æ¿äÄꤹ¤ë¤Ï¤º¤Ç¤¹¡¥Î㤨¤Ð¡¤ syntax.c¤¬syntax.y¤Ë°Í¸¤·¤Æ¤¤¤Æpatch¤¬ syntax.c¤ò¹¹¿·¤·¤Æ¤«¤ésyntax.y¤ò¹¹¿·¤¹¤ë¾ì¹ç¡¤ syntax.y¤¬¹¹¿·¤µ¤ì¤Æ¤¤¤ë¤Ë¤â¤«¤«¤ï¤é¤º¡¤syntax.c¤Ï¤½¤ì¤è¤ê ¸Å¤¤¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡¥

-Z¤ä--set-utc¥ª¥×¥·¥ç¥ó¤Ç¡¤patch¤Ï¥Ñ¥Ã¥Á¤ò¤¢ ¤Æ¤¿¥Õ¥¡¥¤¥ë¤ÎÊÔ½¸»þ¹ï¤È¥¢¥¯¥»¥¹»þ¹ï¤ò¡¤¼þ¤ê¤Îʸ¤ò»ÈÍѤ·¤¿º¹Ê¬¤Î¥Ø¥Ã¥À¤Ç Í¿¤¨¤é¤ì¤ë¥¿¥¤¥à¥¹¥¿¥ó¥×¤ËÀßÄꤷ¤Þ¤¹¡¥¼þ¤ê¤Îʸ¤ò»ÈÍѤ·¤¿º¹Ê¬¤Î¥Ø¥Ã¥À¤Ë¡¤ ¥¿¥¤¥à¥¾¡¼¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¤Coordinated Universal Time(GMT ¤È¤·¤ÆÃΤé¤ì¤Æ¤¤¤ë¤³¤È¤¬Â¿¤¤UTC)¤À¤È²¾Äꤷ¤Þ¤¹¡¥

-T¤ä--set-time¥ª¥×¥·¥ç¥ó¤Ï¡¤-Z¤ä --set-utc¤Î¤è¤¦¤Ëưºî¤·¤Þ¤¹¤¬¡¤¼þ¤ê¤Îʸ¤ò»ÈÍѤ·¤¿º¹Ê¬¤Î¥Ø¥Ã¥À¤Î ¥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¡¤UTC¤ÎÂå¤ï¤ê¤Ë¥í¡¼¥«¥ë¥¿¥¤¥à¤ò»ÈÍѤ·¤Æ¤¤¤ë¤È²¾Äꤷ ¤Þ¤¹¡¥¥í¡¼¥«¥ë¥¿¥¤¥à¤ò»ÈÍѤ·¤Æ¤¤¤ë¥Ñ¥Ã¥Á¤Ï¡¤Â¾¤Î¥¿¥¤¥à¥¾¡¼¥ó¤Ë¤¤¤ë¿Í¤¬´Ê ñ¤Ë»ÈÍѤ¹¤ë¤³¤È¤¬ÉÔ²Äǽ¤Ç¡¤¥í¡¼¥«¥ë¤Ê¥¿¥¤¥à¥¹¥¿¥ó¥×¤Ï¡¤¥í¡¼¥«¥ë¤Ê»þ·×¤¬ ²Æ»þ´Ö¤ËÄ´À°¤µ¤ì¤Æ¤¤¤ë´Ö¤ËÌá¤Ã¤Æ¤·¤Þ¤¦¤Î¤Ç¡¤¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¿ä¾©¤µ¤ì¤Þ¤» ¤ó¡¥¼þ¤ê¤Îʸ¤ò»ÈÍѤ·¤¿º¹Ê¬¤Î¥Ø¥Ã¥À¤¬¥¿¥¤¥à¥¾¡¼¥ó¤ò»ØÄꤷ¤Æ¤¤¤ë¾ì¹ç¡¤¤³¤Î ¥ª¥×¥·¥ç¥ó¤Ï¡¤-Z¤ä--set-utc¤ÈÅù²Á¤Ç¤¹¡¥

patch¤ÏÄ̾¥Õ¥¡¥¤¥ë¤Î¥ª¥ê¥¸¥Ê¥ë¤ÎºÇ½ª¹¹¿·¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤¬ º¹Ê¬¤Î¥Ø¥Ã¥À¤ÇÍ¿¤¨¤é¤ì¤ë¥¿¥¤¥à¥¹¥¿¥ó¥×¤È¥Þ¥Ã¥Á¤·¤Ê¤¤¾ì¹ç¤ä¡¤¥Õ¥¡¥¤¥ë¤ÎÆâ ÍÆ¤¬¥Ñ¥Ã¥Á¤ËÀµ¤·¤¯¥Þ¥Ã¥Á¤·¤Ê¤¤¾ì¹ç¡¤¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤ÇÀßÄꤵ¤ì¤Æ ¤¤¤ë¤â¤Î¤Ë¤¹¤ë¤³¤È¤òº¹¤·¹µ¤¨¤Þ¤¹¡¥¤·¤«¤·¡¤-f¤ä--force ¥ª¥×¥·¥ç¥ó¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¤¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤Ï¤ª¤«¤Þ¤¤¤Ê¤·¤Ë ÀßÄꤵ¤ì¤Þ¤¹¡¥

¸½ºß¤Îdiff½ñ¼°¤ÎÀ©¸Â¤Î¤¿¤á¡¤patch¤ÇÆâÍÆ¤¬Êѹ¹¤µ¤ì¤Æ ¤¤¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¹¹¿·¤¹¤ë¤³¤È¤ÏÉÔ²Äǽ¤Ç¤¹¡¥¤Þ¤¿¡¤¥Õ¥¡¥¤¥ë ¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¸½ºß¤ÎÆü»þ°Ê³°¤ËÀßÄꤹ¤ë¾ì¹ç¡¤¸å¤Ëmake¤Î¸Æ¤Ó ½Ð¤·¤Ç¡¤¥Ñ¥Ã¥Á¤ò¤¢¤Æ¤¿¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤Çº®Í𤷤ʤ¤¤è¤¦¤Ë¡¤¥Ñ¥Ã¥Á ¤ò¤¢¤Æ¤ë¥Õ¥¡¥¤¥ë¤Ë°Í¸¤¹¤ë¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤â(Î㤨¤Ð‘make clean’¤Ç) ºï½ü¤¹¤ë¤Ù¤­¤Ç¤¹¡¥