Dave Mitchell (d...@iabyn.com)

.. except of course that in the perforce days it was normal to merge
several changes in a single commit, so 'git cherry' is only really of any
use for commits after 16th Dec.

On Tue, Jan 06, 2009 at 10:02:35AM +0000, Nicholas Clark wrote:
> Currently the only "sign-off" is that someone with commit access commits it.
> Or, you could argue, that the only sign off is when someone considers it
> valid to merge it to a maintenance branch. It might make sense in the latter
> case, but is that information already stored by the cherry picker?

AFAIKT, the only info 'git cherry-pick' adds is a

    '(cherry picked from commit dba1316b19169da02963765f0dd334687dc9b661)'

text appended to the commit description. And it doesn't even do that if
you have to do a manual resolve, so I've been adding by hand :-(.

On Mon, Jan 05, 2009 at 11:27:47PM +0100, Abe Timmerman wrote:
> I'm sorry; didn't look close enough; you're right it should be cflags.SH
>
> There has been quite some work on it since the git changeover.

Urgh, so there has. I think I might just let smokes continue to fail for
another week and continue merging patches in rough chronological order
rather than trying to assimlate that right now!

Thanks anyway!

On Mon, Jan 05, 2009 at 08:32:02PM +0000, Nicholas Clark wrote:
> Yes, it's about retaining lines from string evals that define subroutines.
>
> I think I merged all the fixes. Tests are in t/comp/retainedlines.t

Ah, thanks.

p5pers,

Some time soon I need to start producing perl5101delta.pod.

I originally started with the good intention of updating it as I went
along, but soon forgot. So there are a year's worth of changes merged from
bleed that need documenting.

Paul Fenwick organised a collective writing effort for perl589delta, but
understandably he's too knackered to do a repeat performance for 5.10.1.

So my question is, is there anyone out there who feels up to such a
challenge? If so, I will marry you and have your babies etc etc.

Note that a subset of perl589delta will also be applicable to perl5101delta.

My current plan (such as it is):

For the next couple of weeks, finish off my backlog of p5p mails and
unmerged patches (I'm down from 7 to 2 months now). So I'm essentially in
assimilation mode currently.

Once I've caught up, I'll probably produce a snapshot. This is the point
where the influx of merged changes becomes a trickle, and is a good time
to start work on perldelta.

Then I'll need to worry about smartmatching, known regressions from
5.10.0, plus any issues arising from the snaphot.

Then comes RC$i while $i++.

Then... profit!

Dave

Disclaimer: I'm being partially funded by the Perl Foundation to get
5.10.1 out of the door.