Re: [PATCH] Make adding notes to patchlevel.h easier

>>>>> On Wed, 19 Feb 2003 01:31:00 +0000, hv@crypt.org (hv) said:

  > andreas.koenig@anima.de (Andreas J. Koenig) wrote:
  > :Would people like that adding a comment to patchlevel.h is as easy as
  > :
  > :    perl -x patchlevel.h comment ...
  > :
  > :? I have a patch for doing that. I think I have to credit Simon Cozens
  > :on doing the initial implementation, I'm not sure, I've used this one
  > :for ages.

  > Thanks, I think this would be very useful; applied as #18749.

  > :+close PLOUT or warn "Couldn't close filehandle writing to patchlevel.new : $!";

  > Hmm, shouldn't this die? It implies the patchlevel.new was not correctly
  > written, doesn't it?

Yupp. Fixed in the patch below.

  > :+Please keep empty lines below so patching of this file doesn't
  > :+interfere with the following lines.

  > I don't understand why patching the file would interfere with anything
  > below this; could you explain some more?

I have rephrased that and also edited the comment above to suggest

  diff -u --context=0

I was thinking about context diffs that exhibit conflicts because they
touch a region that is likely to be edited by other patches. I hope
the reworded sentence explains what I mean. I have also removed a few
of the white lines and added a few below local_changes().

Unfortunately I have not found a way to trick diff(1) into *always*
writing context-less (or context-harmless) diffs for changes in the
local_changes() function. Maybe somebody else has a clever idea?

-- 
andreas


--- patchlevel.h.18751	Wed Feb 19 10:48:05 2003
+++ patchlevel.h	Wed Feb 19 10:50:44 2003
@@ -50,9 +50,11 @@
 	please place your applied patch line after its dependencies. This
 	will help tracking of patch dependencies.
 
-	Please edit the hunk of diff which adds your patch to this list,
-	to remove context lines which would give patch problems.  For instance,
-	if the original context diff is
+	Please either use 'diff -u --context=0' if your diff supports
+	that or edit the hunk of the diff output which adds your patch
+	to this list, to remove context lines which would give patch
+	problems. For instance, if the original context diff is
+
 	   *** patchlevel.h.orig	<date here>
 	   --- patchlevel.h	<date here>
 	   *** 38,43 ***
@@ -94,8 +96,8 @@
     $seen++ if /local_patches\[\]/;
     print PLOUT;
 }
-close PLOUT or warn "Couldn't close filehandle writing to patchlevel.new : $!";
-close PLIN or warn "Couldn't close filehandle reading from patchlevel.h : $!";
+close PLOUT or die "Couldn't close filehandle writing to patchlevel.new : $!";
+close PLIN or die "Couldn't close filehandle reading from patchlevel.h : $!";
 unlink "patchlevel.bak" or warn "Couldn't unlink patchlevel.bak : $!"
   if -e "patchlevel.bak";
 rename "patchlevel.h", "patchlevel.bak" or
@@ -104,23 +106,23 @@
   die "Couldn't rename patchlevel.new to patchlevel.h : $!";
 __END__
 
-Please keep empty lines below so patching of this file doesn't
-interfere with the following lines.
+Please keep empty lines below so that context diffs of this file do
+not ever collect the lines belonging to local_patches() into the same
+hunk.
 
  */
 
 
 
 
-
-
-
 #if !defined(PERL_PATCHLEVEL_H_IMPLICIT) && !defined(LOCAL_PATCH_COUNT)
 static	char	*local_patches[] = {
 	NULL
 	,"DEVEL18374"
 	,NULL
 };
+
+
 
 /* Initial space prevents this variable from being inserted in config.sh  */
 #  define	LOCAL_PATCH_COUNT	\

• [PATCH] Make adding notes to patchlevel.h easier by andreas.koenig
• Re: [PATCH] Make adding notes to patchlevel.h easier by hv
• Re: [PATCH] Make adding notes to patchlevel.h easier by andreas.koenig
• Re: [PATCH] Make adding notes to patchlevel.h easier by hv