In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/c26b8729ead2f4443204c497f98dc3767fca205f?hp=33fe1955034f86b7a9abfc24e0d45a5012030aeb>
- Log ----------------------------------------------------------------- commit c26b8729ead2f4443204c497f98dc3767fca205f Author: Aaron Crane <[email protected]> Date: Fri Nov 11 12:01:24 2016 +0100 RMG: suggest a simpler way of reviewing perlhist changes M Porting/release_managers_guide.pod commit 77087aae3c818e7cc72eaa85f8005396c5addd5e Author: Aaron Crane <[email protected]> Date: Fri Nov 11 11:54:52 2016 +0100 RMG: break a list over multiple lines I found these three similar filenames hard to read when flowed into a single paragraph. M Porting/release_managers_guide.pod ----------------------------------------------------------------------- Summary of changes: Porting/release_managers_guide.pod | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/Porting/release_managers_guide.pod b/Porting/release_managers_guide.pod index 56b8847..d148c21 100644 --- a/Porting/release_managers_guide.pod +++ b/Porting/release_managers_guide.pod @@ -597,9 +597,23 @@ C<$Module::CoreList::Utils::VERSION> should always be equal to C<$Module::CoreList::VERSION>. If necessary, bump those two versions to match before proceeding. -The files to modify are: F<dist/Module-CoreList/lib/Module/CoreList.pm>, -F<dist/Module-CoreList/lib/Module/CoreList/Utils.pm> and -F<dist/Module-CoreList/lib/Module/CoreList/TieHashDelta.pm>. +The files to modify are: + +=over 4 + +=item * + +F<dist/Module-CoreList/lib/Module/CoreList.pm> + +=item * + +F<dist/Module-CoreList/lib/Module/CoreList/Utils.pm> + +=item * + +F<dist/Module-CoreList/lib/Module/CoreList/TieHashDelta.pm> + +=back =head4 Update C<Module::CoreList> with module version data for the new release. @@ -793,12 +807,14 @@ then configure and build perl so that you have a Makefile and porting tools: For the first RC for a MAINT release, copy in the latest F<pod/perlhist.pod> from blead; this will include details of newer releases in all branches. In theory, blead's version should be a strict -superset of the one in this branch, but it's probably safest to diff them -first to ensure that there's nothing in this branch that was forgotten -from blead: - - $ diff pod/perlhist.pod ..../blead/pod/perlhist.pod - $ cp ..../blead/pod/perlhist.pod pod/ +superset of the one in this branch, but it's probably safest to examine the +changes first, to ensure that there's nothing in this branch that was +forgotten from blead. An easy way to do that is with C<< git checkout -p >>, +to selectively apply any changes from the blead version to your current +branch: + + $ git fetch origin + $ git checkout -p origin/blead pod/perlhist.pod $ git commit -m 'sync perlhist from blead' pod/perlhist.pod =head3 update perlhist.pod -- Perl5 Master Repository
