summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Mitchell <davem@iabyn.com>2013-05-07 17:25:11 +0100
committerDavid Mitchell <davem@iabyn.com>2013-05-07 17:27:36 +0100
commit80dd5f25070be474e25d88b05813fc7702df742d (patch)
treef98614ab656d2bfc07a4890b47def5362b3f2b94
parentf6b1864d179797c2a37877d5d08793cb8d971913 (diff)
downloadperl-80dd5f25070be474e25d88b05813fc7702df742d.tar.gz
RMG: maint perlhist: change from push to pull
When creating a new maint release, rather than copying its perlhist entry into every other branch just after release, instead just copy it into blead; then when creating a new maint release, just pull the latest perlhist file from blead.
-rw-r--r--Porting/release_managers_guide.pod20
1 files changed, 17 insertions, 3 deletions
diff --git a/Porting/release_managers_guide.pod b/Porting/release_managers_guide.pod
index 08e8bcbe7f..259db71ed1 100644
--- a/Porting/release_managers_guide.pod
+++ b/Porting/release_managers_guide.pod
@@ -674,6 +674,21 @@ cherry-pick it back).
$ git commit -m 'Update Module::CoreList for 5.x.y' dist/Module-CoreList/lib/Module/CoreList.pm dist/Module-CoreList/lib/Module/CoreList.pod
+=for checklist skip BLEAD BLEAD-POINT
+
+=head3 synchronise from blead's perlhist.pod
+
+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/
+ $ git commit -m 'sync perlhist from blead' pod/perlhist.pod
+
=for checklist skip RC
=head3 update perlhist.pod
@@ -1214,11 +1229,10 @@ Finally, commit:
$ git commit -a -m 'add perlXXXdelta'
-=head3 update perlhist.pod in other branches
+=head3 copy perlhist.pod entries to blead
Make sure any recent F<pod/perlhist.pod> entries are copied to
-F<perlhist.pod> on other branches
-e.g.
+F<perlhist.pod> on blead. e.g.
5.8.9 2008-Dec-14