.\" -*- nroff -*-
.\" $FreeBSD: doc/ja_JP.eucJP/man/man1/patch.1,v 1.9 2001/05/14 01:07:26 horikawa Exp $
.rn '' }`
'\" %FreeBSD: src/gnu/usr.bin/patch/patch.1,v 1.11 1999/09/05 17:31:55 peter Exp %
'\"
'\" %Log: patch.1,v %
'\" Revision 2.0.1.2  88/06/22  20:47:18  lwall
'\" patch12: now avoids Bell System Logo
'\"
'\" Revision 2.0.1.1  88/06/03  15:12:51  lwall
'\" patch10: -B switch was contributed.
'\"
'\" Revision 2.0  86/09/17  15:39:09  lwall
'\" Baseline for netwide release.
'\"
'\" Revision 1.4  86/08/01  19:23:22  lwall
'\" Documented -v, -p, -F.
'\" Added notes to patch senders.
'\"
'\" Revision 1.3  85/03/26  15:11:06  lwall
'\" Frozen.
'\"
'\" Revision 1.2.1.4  85/03/12  16:14:27  lwall
'\" Documented -p.
'\"
'\" Revision 1.2.1.3  85/03/12  16:09:41  lwall
'\" Documented -D.
'\"
'\" Revision 1.2.1.2  84/12/05  11:06:55  lwall
'\" Added -l switch, and noted bistability bug.
'\"
'\" Revision 1.2.1.1  84/12/04  17:23:39  lwall
'\" Branch for sdcrdcf changes.
'\"
'\" Revision 1.2  84/12/04  17:22:02  lwall
'\" Baseline version.
'\"
.de Sh
.br
.ne 5
.PP
\fB\\$1\fR
.PP
..
.de Sp
.if t .sp .5v
.if n .sp
..
'\"
'\"     Set up \*(-- to give an unbreakable dash;
'\"     string Tr holds user defined translation string.
'\"     Bell System Logo is used as a dummy character.
'\"
.ie n \{\
.tr \(*W-\*(Tr
.ds -- \(*W-
.if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
.if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
.ds L" ""
.ds R" ""
.ds L' '
.ds R' '
'br \}
.el \{\
.ds -- \(em\|
.tr \*(Tr
.ds L" ``
.ds R" ''
.ds L' `
.ds R' '
'br\}
.TH PATCH 1 LOCAL
.SH ̾
patch - diff ե򥪥ꥸʥΥեŬѤ
.SH 
.B patch
[options] [origfile [patchfile]] [+ [options] [origfile]]...
.sp
ǤƤϰʲΤ褦ˤޤ
.sp
.B patch
<patchfile
.SH 
.I patch
ϡ
.I diff
ץˤä줿 4 Ĥηκʬޤѥåե
դꥸʥեˤκʬƤơѥåѤߤΥС
ޤ

ǥեưǤϡꥸʥ \*(L".orig\*(R" γĥ
(Ĺե̾򰷤ʤƥǤ \*(L"~\*(R")
դƥХååפȤƻĤǡ
ꥸʥեϥѥåѤߤΥС֤ޤ
ꥸʥХååפĥҤϥץ
\fB\-b\fP (\fB\-\-suffix\fP),
\fB\-B\fP (\fB\-\-prefix\fP)
뤤
\fB\-V\fP (\fB\-\-version\-control\fP)
ˤäơ뤤ϴĶѿ
.B SIMPLE_BACKUP_SUFFIX
ˤäƤѹǤޤ
Ķѿˤϥץˤäƾ񤭤ޤ
.PP
Хååץե뤬¸ߤƤ硢
.B patch
ϿХååץե̾Ȥơ
ե̾ΤǺǽ˽ФƤѾʸʬʸؤ
Ȥޤ
Ѿʸʬʤäϡե̾κǽ 1 ʸΤȤ
¸ΥХååץե̾ȹפʤʤޤǤ򷫤֤ޤ
.PP
եν
\fB\-o\fP (\fB\-\-output\fP)
ǻꤹ뤳ȤǤޤ
⤷˴Ʊե̾Υե뤬¸ߤƤ顢
ޤХååפޤ
.PP
.I patchfile
ꤵʤϥեǤ硢
ѥåɸϤɤ߹ޤޤ
.PP
.I patch
ǽ˹ԤȤϡʬ󤬤ɤʷȽ̤뤳ȤǤ
ϡץ
\fB\-c\fP (\fB\-\-context\fP),
\fB\-e\fP (\fB\-\-ed\fP),
\fB\-n\fP (\fB\-\-normal\fP),
\fB\-u\fP (\fB\-\-unified\fP)
ˤäƷꤹ뤳ȤǤޤ
context diff (old-style, new-style, unified)  normal diff 
.I patch
ȤˤѥåƤޤ
ed diff
äϡѥפ̤ñ˥ѥåե򥨥ǥ
.I ed
ϤǤ
.PP
.I patch
ϡʬ˴ޤޤ르ߤ򥹥åפʬŬѤ
Ƹ˴ޤޤ르ߤ򥹥åפ褦Ȥޤ
Ǥ麹ʬäåʤɤ򤽤Τޤ
.I patch
ͿƤ⡢ޤưϤǤ
ʬΤ̤ǥȤƤƤ⡢
ΤȤθΤޤ
.PP
context diff ξ硢 normal diff ξ⤤餫ƤϤޤޤ
.I patch
ϥѥå˽񤫤줿ֹ椬ʤˤΤ
 hunk (ѥåγơñ)ŬѤ򸫤Ĥ褦Ȼߤޤ
ޤ hunk ˽񤫤줿ֹФ
 hunk ŬѤݤѤեåȤû뤤ϸޤ
줬ǤʤС
.I patch
ϰιԿhunk Υƥ(context)˥ޥåԤ
õޤ
ֺǽϡ
.I patch
ϥƥƤιԤפõޤ
פ꤬Ĥʤ硢
ѥå context diff Ǥꡢ
ۣ(maximum fuzz factor) 1 ʾꤵƤС
ƥȤκǽȺǸιԤ̵뤷ƺԤޤ
Ǥ⸫Ĥʤ硢
ۣ٤ 2 ʾʤ顢ƥȤκǽȺǸ 2 Ԥ̵뤷
ޤ
(ǥեȤκۣ٤ 2 Ǥ)
⤷
.I patch
ѥåƤ򸫤Ĥʤä硢ʬκʬ
ꥸȥե˽Ϥޤꥸȥեϡ̾
ϥե \*(L".rej\*(R" γĥ
(Ĺե̾򰷤ʤƥǤ \*(L"#\*(R")
դΤˤʤޤ
(: ϥѥå context diff ǤäƤ normal diff ǤäƤ⡢
ꥸʬ context diff ǽϤޤ
Ϥ normal diff ξ硢ƥȤ¿ñʤ null ˤʤޤ)
Υꥸȥե˽ϤκʬդƤֹϡ
ΥѥåեˤΤȰäΤˤʤäƤǽ⤢ޤ
ΤΤϾŪˤᤤ֤ˤʤäƤȻפֹˤʤޤ
.PP
ѥåγ hunk ˡΥѥå
(succeeded)ΤԤ(failed)Τ̤ȡ
.I patch
ꤷѥåŬѹ԰(եˤֹ)
𤵤ޤ
ΰ֤ʬ˼줿ֹȰۤʤ硢
Υ(եå)𤵤ޤ
hunk ΤҤȤĤ礭ʥեåȤŬѤ줿硢
ϸä֤ŬѤ줿Ȥ̣֤פޤ
ޤѥåŬѤ˺ݤۣ(fuzz factor)Ѥ줿
λ𤵤ޤξϾäƤߤ٤Ǥ礦
.PP
⤷ꥸʥե뤬ޥɥ饤ǻꤵʤä硢
.I patch
ϡǥåȤ٤ե̾򡢺ʬղäƤ르ߤ
鸫Ĥ褦Ȥޤ
context diff Υإåξ硢ե̾
\*(L"***\*(R" ⤷ \*(L"---\*(R" ǻϤޤԤõ
¸ե˰פǤû̾Ѥޤ
context diffˤϾΤ褦ʹԤޤޤޤ
⤷إå \*(L"Index:\*(R" Ԥä
.I patch
Ϥե̾ȤȤߤޤ
context diff إå Index Ԥͥ褷Ѥޤ
⤷ե̾򸫤Ĥ뤳ȤǤʤä硢
ѥå٤ե̾Ϥ褦ޤ
.PP
⤷ꥸʥե뤬Ĥʤ꡼ɥ꡼Ǥ뤱ɤ⡢
SCCS  RCS ե뤬¸ߤ硢
.I patch
ϤΥեΥåȤ⤷ϥåȤߤޤ
.PP
äơ⤷ʬΥߤ \*(L"Prereq: \*(R" ȤԤޤޤƤС
.I patch
ϤιԤɬ׾ (̾ϥСֹ) 񤤤ƤΤȤߤʤ
ǽ word ꥸʥեƱ word 뤫ɤ
Ĵ٤ޤ⤷ word ȯǤʤС
.I patch
Ͻ¹ԤƤ褤ǧ褦ˤʤޤ
.PP
ɤΤȤ˥塼꡼ȤäƤȤˡ
ѥåޤФ
.Sp
	| patch -d /usr/src/local/blurfl
.Sp
Τ褦˻ؼƤСblurfl ǥ쥯ȥˤե
ľܥѥå򤢤Ƥ뤳ȤǤ롢
ȤȤǤ
.PP
ѥåեˡ1 İʾΥѥåޤޤƤ硢
.I patch
ϡơ̡ΥѥåեǤΤȻפäƽ¹Ԥޤ
ξ硢ѥåƤ٤ꥸʥեϡޤ褦ˡ
ơκʬ椫ФǤ
ޤƺʬҤˤ르ߤʬĴ٤뤳Ȥ
ե̾ӥ٥ν׻ब롢
ȲꤷƤޤ
¾ˡ\*(L'+\*(R' ǷҤƥե̾¤٤뤳Ȥǡ
2 ܰʹߤΥե̾ꤹ뤳ȤǤޤ
(ξǤ⡢ѥåƤοե̾
ꤹ뤳ȤϤǤޤ)
.PP
.I patch
ˤϼΤ褦ʥץ󤬤ޤ:
.TP 5
.B "\-b suff, \-\-suffix=suff"
\*(L".orig\*(R"  \*(L"~\*(R" 
.B suff
ХååץեγĥҤȤƲᤵ褦ˤޤ
.TP 5
.B "\-B pref, \-\-prefix=pref"
.B pref
Хååץե̾դץեåȤ
ᤵ褦ˤޤ
λԤ
.B \-b
λ̵뤵ޤ
.TP 5
.B "\-c, \-\-context"
ѥåե context diff ȤƲᤷޤ
.TP 5
.B "\-C, \-\-check"
ɤԤ뤫ǧޤ¹ԤϤޤ
.TP 5
.B "\-d dir, \-\-directory=dir"
.B dir
ǥ쥯ȥȤߤʤˤΥǥ쥯ȥ˰ưޤ
.TP 5
.B "\-D sym, \-\-ifdef=sym"
"#ifdef...#endif" ¤Ѥƺʬ򼨤ޤ
ʬڤؤ륷ܥȤ
.B sym
Ѥޤ
.TP 5
.B "\-e, \-\-ed"
ѥåե
.I ed
ץȷȤƲᤷޤ
.TP 5
.B "\-E, \-\-remove\-empty\-files"
ѥåŬѸ塢ΥեϺ褦ˤޤ
.TP 5
.B "\-f, \-\-force"
桼ϽƤΤİƤΤȤߤʤ
.I patch
ϲҤͤΤ褦˲ꤷƽʤޤʤ
ѥå٤ꥸʥե븫Ĥ뤳ȤǤʤä
åפޤ
``Prereq:'' ΥСʤƤ⡢ѥå¹Ԥޤ
ѥåѤߤȻפƤ⡢СѥåǤϤʤȲꤷޤ
ʤΥץϡ
.I patch
ɽåޤ󡣥åߤˤ
.B \-s
Ȥޤ
.TP 5
.B "\-t, \-\-batch"
.BR \-f
ƱͤǤΤ褦˲ꤷޤ
ѥå٤ꥸʥե򸫤Ĥ뤳ȤǤʤä
åפޤ(
.BR \-f
Ʊ)
``Prereq:'' ΥСʤϡåפޤ
ѥåѤߤȻפϡСѥåȲꤷޤ
.TP 5
.B "\-F number, \-\-fuzz=number"
ۣ٤ꤷޤ
Υץ context diff ˤΤŬѤ졢
hunk ŬѰ֤õݤ˺ number Ԥ̵뤷ޤ
ͤ礭ȥѥåְäƤǽ뤳Ȥ
դƲ
ǥեͤ 2 Ǥꡢ
context ιԿ(̾ 3)礭ͤˤϤޤ
.TP 5
.B "\-I, \-\-index-first"
.I patch
ˡ``Index:'' Ԥ context diff Υإåͥ褷ư碌ޤ
.B PATCH_INDEX_FIRST
ĶѿꤹƱ̤ޤ
.TP 5
.B "\-l, \-\-ignore\-whitespace"
ѥޥåξˤ֤Ӷ˴ؤ㤤̵뤷ޤ
ѥϢ³ǤոĤζϡϥեϢ³ǤոĤ
˥ޥåޤ
.\"  ʸϰʲΤ褦ˤʤäƤ뤬
.\" Any sequence of whitespace in the pattern line will match any sequence
.\" in the input file.                                        ^^^^^^^^^^^^
.\" ʬ "any sequence of whitespace" Ȥ̣Ȳᤷ
̤ʸΤ˹פʤФʤޤ
context γƹԤФϥե˥ޥåԤʤФʤޤ
.TP 5
.B "\-n, \-\-normal"
ѥåե normal diff ȤƲᤷޤ
.TP 5
.B "\-N, \-\-forward"
Сѥå⤷ϤǤ˥ѥåѤߤǤȻפѥå
åפޤ
.B \-R
⻲ȤƲ
.TP 5
.B "\-o file, \-\-output=file"
.B file
ϥե̾Ȳᤷޤ
.TP 5
.B "\-p[number], \-\-strip[=number]"
ѥ̾ν(strip count)ꤷޤ
ѥåԤȰۤʤǥ쥯ȥ˥ե֤Ƥ硢
ѥåեΥѥ̾ɤΤ褦˲᤹뤫ؼޤ
Ȥϡѥ̾Ƭ鲿ĤΥå뤫
ꤹΤǤ(δ֤ˤǥ쥯ȥ̾ޤ)
㤨СѥåեΥե̾
.sp
	/u/howard/src/blurfl/blurfl.c
.sp
Ǥä硢
.B \-p
뤤
.B \-p0
ץꤹȡѥ̾ޤ
.B \-p1
ꤹȡǽΥå夬ʤ
.sp
	u/howard/src/blurfl/blurfl.c
.sp
Ȥʤꡢ
.B \-p4
ꤹ
.sp
	blurfl/blurfl.c
.sp

.B \-p
ꤷʤ
"blurfl.c"
Ȥʤޤ
Υѥ(u/howard/src/blurfl)ХѥȤ¸ߤ̤ǡ
ξ硢ѥ̾Τ̵ΤޤޤǤ
Ǹˡ줿ե򡢥ȥǥ쥯ȥꤢ뤤
.B \-d
ץǻꤷǥ쥯ȥõޤ
.TP 5
.B "\-r file, \-\-reject\-file=file"
.B file
ꥸȥե̾ȤƲᤷޤ
.TP 5
.B "\-R, \-\-reverse"
Υѥå 2 ĤΥե촹ƺΤǤ뤳Ȥ
.I patch
Τ餻ޤ
(ޤˤϤȤⵯȻפäƤޤ
ʹ֤äƤΤǤ)
.I patch
ϳ hunk ŬѤ˿촹ޤ
ꥸȥե촹ηǽϤޤ
.B \-R
ץ
.I ed
ץȷκʬˤϻȤޤ
μĤФˤϾ­Ƥ뤫Ǥ
.Sp
⤷ѥåκǽ hunk ԤС
.I patch
ϤСѥåˤƤޤŬѤǤ뤫ɤޤ
⤷ޤС
.B \-R
ץ򥻥åȤƥѥåƤޤȿҤͤޤ
ʤСѥå̤̾ŬѤƤޤ
(: ѥå normal diff ǡǽΥޥɤɲ
(ĤޤϺ)ǤȡˡǤϥСѥå򸡽ФǤޤ
ΥƥȤϤɤˤǤޥåΤǡɲϾƤޤ
Ǥ
ȯŪˤϡ
ѥåϹԤɲä뤤ϽΤۤȤɤǤ뤿ᡢ
normal diff ΥСѥåϺϤޤäƼԤˤ뤳Ȥ
ۤȤɤǤ)
.TP 5
.B "\-s, \-\-silent, \-\-quiet"
顼ξʳŤ˽Ԥޤ
.TP 5
.B "\-S, \-\-skip"
ѥåեΤΥѥå̵뤷
Υѥå³褦˻ؼޤ
㤨
.sp
	patch -S + -S + <patchfile
.sp
Ȼꤹȡ3 ĤΥѥåΤ1 ܤ 2 ܤΥѥå̵뤷ޤ
.TP 5
.B "\-u, \-\-unified"
ѥåե unified diff  (unidiff) ȤƲᤷޤ
.TP 5
.B "\-v, \-\-version"
.I patch
ޥɤΥӥإåȥѥå٥ɽޤ
.TP 5
.B "\-V method, \-\-version\-\-control=method"
Хååץե̾κˡȤ
.B method
Ѥޤ
ХååפΥפϴĶѿ
.B VERSION_CONTROL
ǤǤޤΥץϤͥ褷ޤ
.B -B
ϤΥץͥ褷Хååץեݤ
˥ץեåѤ褦ˤޤ
Ķѿ
.B VERSION_CONTROL

.B -V
ץΰλϡGNU Emacs  `version-control' ѿƱͤǤ
ʬ䤹Ʊǧޤ
ͭͤϰʲ̤(դṳ̂Τ):
.RS
.TP
`t' ޤ `numbered'
˿դХååץեޤ
.TP
`nil' ޤ `existing'
Ǥ˿դХååץե뤬¸ߤϡ
դХååפԤ
ʳξϡñʥХååפԤޤ
줬ǥեȤǤ
.TP
`never' ޤ `simple'
ñʥХååפԤޤ
.RE
.TP 5
.B "\-x number, \-\-debug=number"
ΥǥХåե饰ͤꤷޤ
.I patch
ޥɤ˥ѥå򤢤Ƥͤ˴طΤǤ
.SH 
Larry Wall <lwall@netlabs.com>
.br
¿ι׸Ԥ
.SH Ķѿ
.TP
.B TMPDIR
ƥݥե֤ǥ쥯ȥꡣǥեȤǤ /tmp
.TP
.B SIMPLE_BACKUP_SUFFIX
ХååץեդĥҤꤷޤǥեȤǤϡ
\*(L".orig\*(R" ⤷
\*(L"~\*(R"
.TP
.B VERSION_CONTROL
դХååץե뤬ݤ򤷤ޤ
.SH Ϣե
$TMPDIR/patch*
.SH Ϣ
diff(1)
.SH ѥåԤؤ
ѥåäդ褦Ȥݤαդ٤Ĥޤ
 1 ˡpatchlevel.h Ȥե뤳Ȥdzѹ
ʤޤѥåեκǽκʬϤ patchlevel.h 
ѥå򤢤ơѥå٥򥤥󥯥Ȥޤ
ѥå Prereq: ԤƤС
̤˥ѥåŬѤʤ¤ٹ𤬽Фޤ
 2 ˡcontext diff إå Index: Ԥե̾ꤷƤ
ȤǧƲ
֥ǥ쥯ȥˤե˥ѥå򤢤Ƥ褦Ȥϡ
ɬפ˱
.B \-p
ץꤹ褦桼Ʋ
 3 ˡΥեȿեӤ뺹ʬդ뤳Ȥǡ
ե뤳ȤǤޤ
ϡåȥǥ쥯ȥˤοե뤬ޤ¸ߤʤˤΤ
ͭǤ
 4 ˡСѥåդʤ褦˵դƲ
ΥѥåŬѺѤʤΤȳ𤷤ޤ
 5 ˡ㤨 582 Ĥκʬ򤿤äҤȤĤΥեͤù
ϥʥȤ뤳ȤǤ뤳ȤϤǤޤ
ȯˤʤäȤơ
طѥå򤤤ĤΩեˤޤȤᤢۤ
餯Ǥ礦
.SH 
󤷤ʤۤɤ󤢤ޤ̤
.I patch
ѥåեǤʤȤ򼨤Ƥޤ
.PP
å \*(L"Hmm...\*(R" ϡ
ѥåե˽ǤʤƥȤ¸ߤƤ뤳ȡ

.I patch
ϤΥƥ˥ѥå뤫ɤ⤷¸ߤ
ɤΥѥåǤ뤫¬褦ȤƤ뤳Ȥ
Ƥޤ
.PP
ҤȤĤǤꥸȥե뤬С
.I patch
ϥǤʤλơǽλޤ
ĤΥѥå򷫤֤ŬѤϡ
νλơå
ѥåʬŪˤŬѤƤʤեФ
ʤѥå򤢤Ƥʤ褦ˤ٤Ǥ
.SH ٹ
.I patch

.I ed
ץȷǤϹֹΥ򼨤ޤ
ޤ normal diff Ǥ⡢ֹθŦǤΤ
\*(L"change\*(R" ޥɤ \*(L"delete\*(R" ޥɤǤ
context diff ۣ 3 ꤷƱ꤬ͤޤ
Ŭڤå󥿥եɲäޤǤϡ
 context diff ٤ƽ̣Ūɤ
ǧ٤Ǥ礦
󡢥顼ʤѥǤС
ѥåϤޤŬѤ줿ȤʥˤϤʤޤ
ɬ⤤Ĥ⤽Ȥ櫓ǤϤޤ
.PP
Ȥ¿ԤʤƤϤʤʤǤ⡢
.I patch
̾̤ޤ
̤ݾڤǤΤϡ
ѥåΤΤƱСΥեФ
ѥåŬѤǤ
.SH Х
¿ \&deviant եåȤ촹ɤˤꡢ
ʬŪʥޥå󥰤˴ؤƹ˸Ǥޤ
ΤˤϥѥɲäɬפꤽǤ
.PP
ɤʣƤ(㤨 #ifdef OLDCODE ... #else ... #endif 
ä)
.I patch
ξԤ˥ѥå򤢤Ƥ뤳ȤǤޤ
Ƥǥѥåޥɤޤä硢
ΥѥåϤ餯äŬѤƤꡢ
ޤˡޤפ𤷤Ƥޤ
.PP
ŬѺѤΥѥå򤢤Ƥȡ
.I patch
ϤСѥåȹͤŬѤѥå򳰤ɤҤͤƤޤ
ħΰĤȲǽǤ礦
.rn }` ''