In perl.git, the branch maint-5.10 has been updated <http://perl5.git.perl.org/perl.git/commitdiff/5b53e9f3c366c11df59536b294aba43e843db9b0?hp=a2ad4a7a509068b0c747a0de4d100ac4707bfc50>
- Log ----------------------------------------------------------------- commit 5b53e9f3c366c11df59536b294aba43e843db9b0 Author: David Mitchell <[email protected]> Date: Wed Aug 5 00:07:55 2009 +0100 today's merging activity M Porting/mergelog commit aa1645ad43c2372908dff91e1f18bbfed0731200 Author: David Mitchell <[email protected]> Date: Tue Aug 4 23:08:59 2009 +0100 release_managers_guide: add patchlevel.h stuff (cherry picked from commit d7eb1120ad049806b32041fcc301bf95f95423bc) M Porting/release_managers_guide.pod ----------------------------------------------------------------------- Summary of changes: Porting/mergelog | 9 ++++++++ Porting/release_managers_guide.pod | 37 +++++++++++++++++++++++++++-------- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/Porting/mergelog b/Porting/mergelog index d8d0ec5..f1539dd 100644 --- a/Porting/mergelog +++ b/Porting/mergelog @@ -3825,3 +3825,12 @@ M 91fb030ae1 2009/08/03 Maintainers.pl: update for ExtUtils::Install M d10dbbde5a 2009/08/03 bump-perl-version: over-keen false-positive remova M 38711ea604 2009/08/03 Continued work to get Porting/checkAUTHORS.pl to a M b5e2dde18e 2009/08/03 Now down to 50 addresses in the git logs who aren' +M 4d2c8158ba 2009/08/04 Fix corelist generation section of the release man +M bfadf2baa9 2009/08/04 Improve the broken order of the release_managers_g +M c2615aa941 2009/08/04 Removed bald-faced lies I inserted about the merge +M d781deb654 2009/08/04 WIFEXITED() cygwin regression +d dd3e51dc8a 2009/08/04 Promote blocks resulting from constant folding to +M 2e831dfd27 2009/08/04 release_managers_guide: make into two logical sect +M 20b15ed1ed 2009/08/04 The AUTHORS file is now short only about thirty 'r +M dd0e54ba0e 2009/08/04 minor tweaks to release_managers_guide.pod +M d7eb1120ad 2009/08/04 release_managers_guide: add patchlevel.h stuff diff --git a/Porting/release_managers_guide.pod b/Porting/release_managers_guide.pod index 38f2fcd..17315dd 100644 --- a/Porting/release_managers_guide.pod +++ b/Porting/release_managers_guide.pod @@ -421,7 +421,7 @@ is listed in the section entitled C<THE KEEPERS OF THE PUMPKIN>. Be sure to commit your changes: - $ git commit -m 'Updating perlhist in preparation for release of 5.x.y pod/perlhist.pod + $ git commit -m 'Updating perlhist in preparation for release of 5.x.y' pod/perlhist.pod =item * @@ -445,13 +445,6 @@ formatting, e.g. I<You MUST SKIP this step for SNAPSHOT> -Update patchlevel.h to add a C<-RC1>-or-whatever string; or, if this is a -final release, remove it. [ XXX how now?? see 34813 for old way ] - -=item * - -I<You MUST SKIP this step for SNAPSHOT> - Update C<Module::Corelist>. Note that if this is a maint release, you should run the following actions @@ -521,6 +514,22 @@ Build perl, then make sure it passes its own test suite, and installs: =item * +I<You MUST SKIP this step for SNAPSHOT> + +Update patchlevel.h to add a C<-RC1>-or-whatever string; or, if this is a +final release, remove it. For example: + + static const char * const local_patches[] = { + NULL + + ,"RC1" + PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */ + +Be sure to commit your change: + + $ git commit -m 'bump version to RCnnn' patchlevel.h + +=item * + Create a tarball. Use the C<-s> option to specify a suitable suffix for the tarball and directory name: @@ -643,7 +652,17 @@ created. I<You MUST SKIP this step for SNAPSHOT> -Disarm the patchlevel.h change [ XXX expand ] +Disarm the patchlevel.h change; for example, + + static const char * const local_patches[] = { + NULL + - ,"RC1" + PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */ + +Be sure to commit your change: + + $ git commit -m 'disarm RCnnn bump' patchlevel.h + =item * -- Perl5 Master Repository
