diff options
| author | Ricardo SIGNES <rjbs@cpan.org> | 2009-07-22 22:29:10 -0700 |
|---|---|---|
| committer | Chip Salzenberg <chip@pobox.com> | 2009-07-22 23:32:20 -0700 |
| commit | 7f4ffa9dba4691a2cd3285cfb3fd76f6f6bd661b (patch) | |
| tree | ec94882b1374299257a6d87f8582c0019d4b3e18 /pod/perlrepository.pod | |
| parent | 02569b83981ae18ebfaeeac6872f94b7afd6e5a6 (diff) | |
| download | perl-7f4ffa9dba4691a2cd3285cfb3fd76f6f6bd661b.tar.gz | |
[rjbs] very minor tweaks to description of maint/blead
(cherry picked from commit 1b7ad6bc0c93abd2d9fad847e8449824e529ba24)
Diffstat (limited to 'pod/perlrepository.pod')
| -rw-r--r-- | pod/perlrepository.pod | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pod/perlrepository.pod b/pod/perlrepository.pod index f961acf19b..97080d471e 100644 --- a/pod/perlrepository.pod +++ b/pod/perlrepository.pod @@ -15,9 +15,9 @@ system we were using previously. This repository is accessible in different ways. The full repository takes up about 80MB of disk space. A check out of -the blead branch (that is, the master branch, which contains bleadperl, -the development version of perl 5) takes up about 160MB of disk space -(including the repository). A build of bleadperl takes up about 200MB +the blead branch (that is, the main development branch, which contains +bleadperl, the development version of perl 5) takes up about 160MB of disk +space (including the repository). A build of bleadperl takes up about 200MB (including the repository and the check out). =head1 GETTING ACCESS TO THE REPOSITORY @@ -256,10 +256,11 @@ that you're on the I<blead> branch, and your repository is up to date: % git checkout blead % git pull -(It's preferable to patch against the latest blead version, since -patches are usually integrated from blead to the maintenance branches. -This does not apply, obviously, in the rare case where your patch is -specific to a maintaince release.) +It's preferable to patch against the latest blead version, since +this is where new development occurs for all changes other than critical +bug fixes. Critical bug fix patches should be made against the relevant +maint branches, or should be submitted with a note indicating all the +branches where the fix should be applied. Now that we have everything up to date, we need to create a temporary new branch for these changes and switch into it: @@ -665,6 +666,8 @@ And then push back to the repository: =head1 COMMITTING TO MAINTENANCE VERSIONS +Maintenance versions should only be altered to add critical bug fixes. + To commit to a maintenance version of perl, you need to create a local tracking branch: |