PATCH: clarify where to patch against

--envbJBWh7q8WU6mo
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline


Talking about Perl 5 git repo tonight, some questions came up about where
development really happens.  This patch is a bit of clarification about
where/why patches go to blead/maint.

-- 
rjbs

--envbJBWh7q8WU6mo
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0001-very-minor-tweaks-to-description-of-maint-blead.patch"

From 1b7ad6bc0c93abd2d9fad847e8449824e529ba24 Mon Sep 17 00:00:00 2001
From: Ricardo SIGNES <rjbs@cpan.org>
Date: Wed, 22 Jul 2009 22:29:10 -0700
Subject: [PATCH] very minor tweaks to description of maint/blead

---
 pod/perlrepository.pod |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pod/perlrepository.pod b/pod/perlrepository.pod
index f961acf..97080d4 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:
 
-- 
1.6.3.1


--envbJBWh7q8WU6mo--
0
perl
7/23/2009 5:58:51 AM
perl.perl5.porters 48287 articles. 1 followers. Follow

7 Replies
737 Views

Similar Articles

[PageSpeed] 21
Get it on Google Play
Get it on Apple App Store

On Thu, Jul 23, 2009 at 12:58 AM, Ricardo
SIGNES<perl.p5p@rjbs.manxome.org> wrote:
>
> Talking about Perl 5 git repo tonight, some questions came up about where
> development really happens. =A0This patch is a bit of clarification about
> where/why patches go to blead/maint.
>
> --

I'm not entirely sure about this patch.  Rarely should a patch ever be
applied directly to maint without hitting blead first.  I can only
think of one case where I had a patch applied to maint only and that
was due to API differences between blead and maint.  I'd rather that
patches be pointed at blead than at maint without being directed by
the appropriate pumpking.

Steve Peters
steve@fisharerojo.org
0
steve
7/23/2009 1:17:00 PM
2009/7/23 Steve Peters <steve@fisharerojo.org>:
> On Thu, Jul 23, 2009 at 12:58 AM, Ricardo
> SIGNES<perl.p5p@rjbs.manxome.org> wrote:
>>
>> Talking about Perl 5 git repo tonight, some questions came up about wher=
e
>> development really happens. =A0This patch is a bit of clarification abou=
t
>> where/why patches go to blead/maint.
>>
>> --
>
> I'm not entirely sure about this patch. =A0Rarely should a patch ever be
> applied directly to maint without hitting blead first. =A0I can only
> think of one case where I had a patch applied to maint only and that
> was due to API differences between blead and maint. =A0I'd rather that
> patches be pointed at blead than at maint without being directed by
> the appropriate pumpking.

Chip has already applied it, although with another commit message,
with a workflow leak somehow:
http://perl5.git.perl.org/perl.git/commitdiff/7f4ffa9dba4691a2cd3285cfb3fd7=
6f6f6bd661
0
rgarciasuarez
7/23/2009 1:36:16 PM
On Thu, Jul 23, 2009 at 8:36 AM, Rafael
Garcia-Suarez<rgarciasuarez@gmail.com> wrote:
> 2009/7/23 Steve Peters <steve@fisharerojo.org>:
>> On Thu, Jul 23, 2009 at 12:58 AM, Ricardo
>> SIGNES<perl.p5p@rjbs.manxome.org> wrote:
>>>
>>> Talking about Perl 5 git repo tonight, some questions came up about whe=
re
>>> development really happens. =A0This patch is a bit of clarification abo=
ut
>>> where/why patches go to blead/maint.
>>>
>>> --
>>
>> I'm not entirely sure about this patch. =A0Rarely should a patch ever be
>> applied directly to maint without hitting blead first. =A0I can only
>> think of one case where I had a patch applied to maint only and that
>> was due to API differences between blead and maint. =A0I'd rather that
>> patches be pointed at blead than at maint without being directed by
>> the appropriate pumpking.
>
> Chip has already applied it, although with another commit message,
> with a workflow leak somehow:
> http://perl5.git.perl.org/perl.git/commitdiff/7f4ffa9dba4691a2cd3285cfb3f=
d76f6f6bd661
>

Maybe Ricardo and/or Chip can fill us in on the conversation that led
to this patch.  It certainly is not an accurate description of current
practice.  Particularly the statement, "Maintenance versions should
only be altered to add critical bug fixes," is a pretty radical change
and raises more questions than it answers (such as what constitutes
"critical").  Even if that's a release workflow we can or should get
to, it's a long way from here to there and at the very least the doc
patch is more predictive than descriptive.
0
craig
7/23/2009 4:29:26 PM
On Thu, Jul 23, 2009 at 11:29:26AM -0500, Craig A. Berry wrote:
> Maybe Ricardo and/or Chip can fill us in on the conversation that led to
> this patch.

Our develoment resources and enthusiasms are diffused between blead and
maint, mostly because of the incredibly long blead release cycle; anyone who
wants to see something new and therefore pushes for inclusion in maint has
been making s rational choice (until now).  More development emphasis on
blead, and an increase blead release frequency, will fix this problem; it
will be good for the project, and will happen.  This emphasis is, of
necessity, at the expense of backporting non-critical patches into maint.

I don't imagine Dave would disagree that maint is pulling in too much stuff.
$DEITY, after the delay on 5.10.1, a person could be forgiven for wishing
for a separate "critical-maint" branch.  And that's just nuts.

Of course the adjective "critical" is imprecise, because it's human natural
language.  As always patches will be considered on their individual merits.
-- 
Chip Salzenberg
0
chip
7/23/2009 4:59:18 PM
On Thu, Jul 23, 2009 at 09:59:18AM -0700, Chip Salzenberg wrote:
> I don't imagine Dave would disagree that maint is pulling in too much stuff.
> $DEITY, after the delay on 5.10.1, a person could be forgiven for wishing
> for a separate "critical-maint" branch.  And that's just nuts.

What Dave actually thinks is that he'd like to have a good long discussion
about this once 5.10.1 is out of the door, rather than being railroaded
into going along with some hasty decisions made by a few "unelected"
people at OSCON last night, who came to the conclusion that by ignoring
most issues, they have solved them.

-- 
That he said that that that that is is is debatable, is debatable.
0
davem
7/23/2009 6:17:16 PM
On Thu, Jul 23, 2009 at 07:17:16PM +0100, Dave Mitchell wrote:
> On Thu, Jul 23, 2009 at 09:59:18AM -0700, Chip Salzenberg wrote:
> > I don't imagine Dave would disagree that maint is pulling in too much stuff.
> > $DEITY, after the delay on 5.10.1, a person could be forgiven for wishing
> > for a separate "critical-maint" branch.  And that's just nuts.
> 
> What Dave actually thinks is that he'd like to have a good long discussion
> about this once 5.10.1 is out of the door ...

Fair enough; consider the question of your opinion on this tabled.

For my part, I've tested the 5.10.1 snapshot (successfully) with some
DarkPAN code, and will attempt to resolve some of

  http://rt.perl.org/rt3//Public/Search/Simple.html?Query=MemberOf%3D66092+and+status!=%27resolved%27

which is a list of 5.10 bugs any core hacker would do well to look at.
-- 
Chip Salzenberg
0
chip
7/23/2009 6:23:57 PM
On Jul 23, 2009, at 11:17 AM, Dave Mitchell wrote:

> What Dave actually thinks is that he'd like to have a good long  
> discussion
> about this once 5.10.1 is out of the door, rather than being  
> railroaded
> into going along with some hasty decisions made by a few "unelected"
> people at OSCON last night, who came to the conclusion that by  
> ignoring
> most issues, they have solved them.

I think that might be overstating what conclusions we came to, but it  
would definitely be worthwhile to have that good, long discussion  
after 5.10.1 ships.

Best,

David
0
david
7/23/2009 7:26:17 PM
Reply:

Similar Artilces:

Patches, patches, patches...
To forestall potential incidents of Warnock's Dillemma... I'm about to apply a whole heap 'o patches to Parrot. (With appropriate [APPLIED] responses, I hope) If, at the end of the day, I have *not* applied or commented on a patch you've sent, it means I've Officially Missed It, so give another try. Sorry 'bout this. Too much mail in the mailbox, and going back in time is tricky, as it can miss subsequent discussions on patches 'n stuff. -- Dan --------------------------------------"it's like th...

Patches, patches, patches... #2
OK, this is advance warning that I'm about to be reposting a bunch of patches of mine which appear to have succumbed to Warnock's Dilemma. The first three should be uncontroversial: there's a documentation fix-up for core.ops, and new tests for strings and stacks. The last one is rather larger, and consists of a greatly expanded set of tests for PerlString's, plus a bunch of bug-fixes. I'd be grateful if Jeff or Dan could take a look at this, as I have the feeling that a lot of the scalar PMCs are going to need similar fixes. Simon ...

[PATCH] Patch to patch for callbacks in core
I should have tested this better before submitting it. This patch is to Perl 11722 after applying my previous patch. Now callbacks will actually work. :-) - D <dmlloyd@tds.net> --- mg.c-old Tue Aug 21 13:26:52 2001 +++ perl-devel/mg.c Tue Aug 21 15:09:16 2001 @@ -1068,7 +1068,18 @@ void Perl_despatch_signals(pTHX) { - PL_event_pending = 0; + if (PL_callback_head != NULL) { + CALLBACK *cur, *next; + + for (cur = PL_callback_head; cur != NULL; cur = next) { + next = cur->next; + (*cur->callback)(cur->data); + ...

[PATCH] installperl patch
------=_Part_72778_11907270.1186149310146 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline The attached patch modifies installperl as follows: 1. Don't install lib/CGI/eg/*. (These files aren't installed by the CPAN version of CGI either.) 2. Don't install lib/ExtUtils/NOTES, and lib/ExtUtils/PATCHING. (These files aren't installed by the CPAN version of ExtUtils::MakeMaker either.) ------=_Part_72778_11907270.1186149310146 Content-Type: application/octet-stream; name=installperl.patch Content-Transf...

[PATCH] more pod patches
Yet more pod linting, this time on .pm files. I've touched things without fear or favour mostly - I think probably a few of these changes affect things that are also maintained outside the core. diff -urN perl-current.orig/configpm perl-current/configpm --- perl-current.orig/configpm Thu Mar 15 20:33:42 2001 +++ perl-current/configpm Thu Mar 15 21:10:59 2001 @@ -418,7 +418,7 @@ print CONFIG <<EOF; =head2 $c -=over +=over 4 EOF $text = 1; diff -urN perl-current.orig/ext/B/B/Bytecode.pm perl-current/ext/B/B/Bytecode.pm --- perl-current.orig/ext/B/B/B...

BlackIce Patched or Not Patched?
ISS recently released a patch for the much published denial of server venerability in BlackIce Defender. Yet, eEye referred to the venerability as a buffer overflow. My question is ... does the newly released patch cover both? The ISS site does not refer to a buffer overflow. Does that mean that even after installing the patch BlackIce Defender is open to a buffer overflow? (not good if so) I've taken BlackIce offline until I am certain that it is fully patched. Thanks in advance. Tom Correction: Denial of service venerability as opposed to denial of server. (grin) ...

[PATCH] Debian patches
--qDbXVdCdHGoSgWSk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Attached are the patches to Debian's 5.8.4 package not currently covered by my latest rsync of perl-5.8.x. The patches have been re-worked to apply cleanly to that branch, but all should be applicable to perl-current as well. 10_fix_file_path Rewrite of File::Path::rmtree. This is the most important patch, it replaces rmtree with a recursive function to remove a race condition which potentially allows an attacker to make files suid or to remove arbitrary files (CAN-2...

[PATCH] cygwin070patches_4.patch
--------------030804070801060907040802 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit My latest patch against the cygwin070patches branch r30596. * Finished implementation of the makefile expansion - "perl-style" * Changed all relevant makefile templates. make fulltest and make codetest has the same few mt-thread and resume errors as always. A new idea: =========== #IF(darwin): #ALSO:# MACOSX_DEPLOYMENT_TARGET must be defined for OS X #ALSO:export MACOSX_DEPLOYMENT_TARGET := @osx_version@ The POD for this change: ...

[PATCH] todo patch
--- perltodo.pod.old Wed May 16 17:51:45 2001 +++ perltodo.pod Mon May 28 16:56:29 2001 @@ -68,6 +68,10 @@ Artur Bergman's C<iThreads> module is a start on this, but needs to be more mature. +=head2 make perl_clone optionally clone ops + +So at pseduforking, mod_perl , iThreads and nvi will work properly (not as efficient) until regex engine is fixed + =head2 Work out exit/die semantics for threads =head2 Typed lexicals for compiler On Mon 28 May 2001 17:03, Artur Bergman <artur@contiller.se> wrote: > --- perltodo.pod.old Wed May 16 17:5...

Microsoft patching its patches
While we're on the topic of zombies, security and patches..... George. ------------------------------------------------------------------------ "Exchange security patch needs patching" The patch needs a patch. The security update Microsoft rolled out last week to caulk a hole in Exchange 2000 server actually needs a patch itself. MS is also broadening its original Exchange 2000 security bulletin to include Exchange 5.5 Server deployments for the first time. Microsoft says if you've deployed Outlook Web Access, you need to patch ASAP. SOURCE: ENT Magazine http...

[PATCH] patching for sunos
Hi coders, greetings from the stone age: This is perl, v5.9.4 built for sun4-sunos-stdio SunOS Release 4.1.3 (GENERIC) #3: Mon Jul 27 16:44:16 PDT 1992 $ uname -a SunOS xxx 4.1.3 3 sun4m If anyone is interested in patches for SunOS yet, I have some. Some are harmless, some may not be optimal. Help/hints/tips are always nice and appreciated. 1. SunOS realloc() does not like NULL pointers as parameters. (buf?realloc((buf), (size)):malloc((size))) 2. There is no strtoul(), alas. Some older code correctly uses the Strtoul() macro (capital S). Newer additions don't...

[PATCH] More Build patches
Two patches inline... A small change to Makefile.in so that 'make test' doesn't try to run without an interpreter or missing assembler libraries. Index: Makefile.in =================================================================== RCS file: /home/perlcvs/parrot/Makefile.in,v retrieving revision 1.24 diff -u -r1.24 Makefile.in --- Makefile.in 2001/10/14 10:58:19 1.24 +++ Makefile.in 2001/10/15 14:42:12 @@ -106,7 +106,7 @@ cd t; make clean cd docs; make clean -test: .test_dummy +test: $(TEST_PROG) assemble.pl .test_dummy .test_dummy: ...

[PATCH] perlhack on what to patch
--- pod/perlhack.pod.orig 2006-07-12 22:52:14.000000000 +0300 +++ pod/perlhack.pod 2006-07-12 23:05:40.000000000 +0300 @@ -598,14 +598,22 @@ =head2 Submitting patches but context diffs are accepted. Do not send RCS-style diffs or diffs without context lines. More information is given in the I<Porting/patching.pod> file in the Perl source distribution. Please -patch against the latest B<development> version (e.g., if you're -fixing a bug in the 5.005 track, patch against the latest 5.005_5x -version). Only patches that survive the heat of the development ...

[PATCH] Last patch needed to get Perl5.7 to build natively on VOS
This is the final patch necessary to get Perl 5.7 (@14042) to build on the Stratus VOS operating system using the native (Configure-based) build procedure. Horay, Horay, Horay! I discovered, moments after mailing the previous patch, that I had broken the historical method of building just miniperl on VOS (the method used by the ./vos subdir). This patch restores that function. Patched files & reasons changed: perl.h VOS-only change. Obey idiosyncracies of GCC vs. VOS cc compiler. vos/vosish.h VOS-only change. Ditto. ext/Errno/Errno_pm.PL VOS-only change. More id...

Web resources about - PATCH: clarify where to patch against - perl.perl5.porters

Wikipedia:Please clarify - Wikipedia, the free encyclopedia
When using these templates, be specific : mark individual phrases, sentences, and sections in preference to entire articles. Additionally, be ...

Facebook Tests Ways To Clarify Social Sharing
One of the biggest concerns about using social readers is users’ confusion over whether or not content is being shared, and Facebook appears ...

Instagram says it doesn’t intend to ‘sell’ user photos, plans to clarify terms of use
Instagram today responded to concerns raised by users and the press after it proposed updates to its terms of use and privacy policy on Monday ...

Mac App Store - Clarify
Read reviews, get customer ratings, see screenshots, and learn more about Clarify on the Mac App Store. Download Clarify for [?] and enjoy it ...

[iOS Advice] How To Clarify Your Email Replies By Quoting Selected Text - YouTube
Follow me on Twitter: http://www.twitter.com/macmixing Like my Facebook page: http://www.facebook.com/macmixing RATE, COMMENT, SUBSCRIBE! :-) ...

To stem ISIL's advance, US needs to clarify Syria strategy - The National
Washington’s ‘confused’ policy in Syria, and a strategy of containment rather than destruction have allowed the extremist group to exist despite ...

Pyne forced to clarify education reforms
Education Minister Christopher Pyne has been forced to clarify the government's higher education reforms.

Insurance risk modelers look to clarify cyber risk costs
There are no existing models to calculate how much a so-called "cyber hurricane", affecting a swath of companies, could cost.

Pressure on Grand Mufti to clarify comment - PerthNow Search Search
... government figures have said. FEDERAL Treasurer Scott Morrison and senior colleagues on Tuesday called for Ibrahim Abu Mohammed to clarify ... ...

Please allow me to clarify that remark …
Hindsight I'm just a columnist whose intentions are good. But, Lord, am I feeling misunderstood.

Resources last updated: 1/2/2016 1:34:33 AM