diff options
| author | Andreas König <a.koenig@mind.de> | 2003-02-19 12:05:28 +0100 |
|---|---|---|
| committer | hv <hv@crypt.org> | 2003-03-02 22:36:05 +0000 |
| commit | 22adf171e6a33aa2d076b4a9a86b73487d6534c0 (patch) | |
| tree | 3f2fd153110534187565b2325b59a02e8739fd2c /patchlevel.h | |
| parent | a4fe5ed87a9a8e25914c68f9d7d5d7e3a2514f95 (diff) | |
| download | perl-22adf171e6a33aa2d076b4a9a86b73487d6534c0.tar.gz | |
Re: [PATCH] Make adding notes to patchlevel.h easier
Message-ID: <m3d6lozitz.fsf@k242.linux.bogus>
p4raw-id: //depot/perl@18812
Diffstat (limited to 'patchlevel.h')
| -rw-r--r-- | patchlevel.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/patchlevel.h b/patchlevel.h index 65ad040cb3..4fe0980d1f 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -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 @@ while (<PLIN>) { $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,17 +106,15 @@ rename "patchlevel.new", "patchlevel.h" or 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 @@ -122,6 +122,8 @@ static char *local_patches[] = { ,NULL }; + + /* Initial space prevents this variable from being inserted in config.sh */ # define LOCAL_PATCH_COUNT \ (sizeof(local_patches)/sizeof(local_patches[0])-2) |