Skip to content

Commit 32373f0

Browse files
authored
patch: pod update for --ifdef
* Remove note about GNU patch requiring a space between -D and argument (this might've been the case for ancient versions but not anymore) * This version of patch outputs a trailing comment for the ifndef blocks; this matches the OpenBSD version %ifconfig > A %sed 's/eth0/ent0/' A > B %perl diff -u A B > AB.diff %/usr/bin/patch --version GNU patch 2.7.6 %/usr/bin/patch -Dostuff -o C A AB.diff patching file C (read from A) %perl patch -Dostuff -o D A AB.diff Hmm... Looks like a unified diff to me... Patching file A using Plan B... Hunk briandfoy#1 succeeded at 1. done %perl diff C D 5c5 < #endif --- > #endif /* ostuff */
1 parent 0c8e2af commit 32373f0

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

bin/patch

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,7 +1263,7 @@ directory, and cd to it before doing anything else.
12631263
12641264
causes I<patch> to use the "#ifdef...#endif" construct
12651265
to mark changes. The argument following will be used
1266-
as the differentiating symbol. [see L<"note 7">]
1266+
as the differentiating symbol.
12671267
12681268
=item -e or --ed
12691269
@@ -1585,11 +1585,6 @@ thinks the failed hunks belong in the new file rather than the old one.
15851585
If the original file cannot be found or is read-only, but a suitable SCCS or RCS
15861586
file is handy, GNU patch will attempt to get or check out the file.
15871587
1588-
=head2 note 7
1589-
1590-
GNU patch requires a space between the B<-D> and the argument. This has been
1591-
made optional.
1592-
15931588
=head1 AUTHOR
15941589
15951590
The Perl implementation of I<patch> was written by Tim Gim Yee,

0 commit comments

Comments
 (0)