Change 17772 by [EMAIL PROTECTED] on 2002/08/25 14:49:37
Subject: Re: p5p patches
From: "H.Merijn Brand" <[EMAIL PROTECTED]>
Date: Fri, 23 Aug 2002 15:27:48 +0200
Message-Id: <[EMAIL PROTECTED]>
Affected files ...
.... //depot/perl/Porting/patching.pod#9 edit
Differences ...
==== //depot/perl/Porting/patching.pod#9 (text) ====
Index: perl/Porting/patching.pod
--- perl/Porting/patching.pod#8~16867~ Wed May 29 16:25:09 2002
+++ perl/Porting/patching.pod Sun Aug 25 07:49:37 2002
@@ -63,6 +63,10 @@
to the original) and context diffs (where several lines surrounding the changes
are included). See the manpage for diff for more details.
+When GNU diff is available, the pumpkins would prefer you use C<-u -p>
+(--unified --show-c-function) as arguments for optimal control. The
+examples below will only use -u.
+
The preferred method for creating a unified diff suitable for feeding
to the patch program is:
@@ -92,8 +96,15 @@
% diff -bu a/file b/file
# show function name in every hunk (safer, more informative)
+ % diff -u -p old/file new/file
% diff -u -F '^[_a-zA-Z0-9]+ *(' old/file new/file
+ # show sub name in perl files and modules
+ % diff -u -F '^sub' old/file.pm new/file.pm
+
+ # show header in doc patches
+ % diff -u -F '^=head' old/file.pod new/file.pod
+
=item Derived Files
Many files in the distribution are derivative--avoid patching them.
@@ -344,6 +355,11 @@
the machine the patch was created on and the machine on which it is
being applied.
+Be sure to use the Larry Wall version of patch. Some Operating Systems
+(HP-UX amongst those) have a patch command that does something completely
+different. The correct version of patch will show Larry's name several
+times when invoked as patch --version.
+
=item Cut and paste
B<Never> cut and paste a patch into your editor. This usually clobbers
@@ -383,12 +399,14 @@
=head1 Last Modified
-Last modified 21 January 1999
+Last modified 22 August 2002
+H.Merijn Brand <[EMAIL PROTECTED]>
+Prev modified 21 January 1999
Daniel Grisinger <[EMAIL PROTECTED]>
=head1 Author and Copyright Information
-Copyright (c) 1998, 1999 Daniel Grisinger
+Copyright (c) 1998-2002 Daniel Grisinger
Adapted from a posting to perl5-porters by Tim Bunce ([EMAIL PROTECTED]).
End of Patch.
