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? 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 ??? Anyway, the answer to the original question is that (as I pointed on p5p yesterday), git doesn't maintain metastate about cherry-picks, so you could have just cherry-picked the commit into blead (and maybe edited the commit message to explain what happened). -- But Pity stayed his hand. "It's a pity I've run out of bullets", he thought. -- "Bored of the Rings"
