On Sat, Jun 27, 2009 at 02:28:35PM +0100, Dave Mitchell wrote:
> On Thu, Jun 25, 2009 at 05:27:33PM +0100, Nicholas Clark wrote:
> > On Thu, Jun 25, 2009 at 06:09:53PM +0200, Nicholas Clark wrote:
> > > In perl.git, the branch maint-5.10 has been updated
> > 
> > Oops. That was the wrong branch.
> > Is it best if someone who understands merging merges it to blead?
> > 
> > (rather than me simply commit it to blead independently)
> > 
> > Which is going to be less confusing long term?
> 
> 
> Um, surely that was the right branch?

Well, I thought that it was the wrong branch, as I thought that it was
aimed at blead...

> That commit was suitable for maint, since its adding warnings that
> suidperl is deprecated; whereas you don't want it in blead, since
> perlsec.pod no longer discusses suidperl ???

But yes, someone called Nicholas Clark made this commit

http://perl5.git.perl.org/perl.git/commitdiff/cc69b689ee7c274593c3c386a61a06ecb909431c#patch9

which removes a chunk of text that the patch changed.

So, gosh, I didn't actually screw up.

Nicholas Clark

Reply via email to