On 05/20/2017 08:01 AM, Ævar Arnfjörð Bjarmason wrote: > On Sat, May 20, 2017 at 3:16 PM, Dave Mitchell <davem@iabyn.com> wrote: >> On Sat, May 20, 2017 at 02:57:12PM +0200, Sawyer X wrote: >>> >>> >>> On 05/20/2017 12:56 PM, Dave Mitchell wrote: >>>> On Sat, May 20, 2017 at 11:38:28AM +0200, Sawyer X wrote: >>>>> >>>>> On 05/17/2017 03:16 PM, Dave Mitchell wrote: >>>>>> On Tue, May 16, 2017 at 04:13:33PM +0200, Sawyer X wrote: >>>>>>>> Are you in a position to be able to coalesce soon? If not I could have a >>>>>>>> go. >>>>>>> Also, worth noting: I *have* coalesced them, just with some mistakes. >>>>>>> Feel free to add it yourself to perldelta directly. >>>>>> Yeah sorry, I realised that later - I must have been looking at the wrong >>>>>> branch when I saw an emptyish perldelta. >>>>> I need to go over BLEAD-FINAL and RC release instructions again to see >>>>> what else I did wrong. :) >>>>> >>>>> >>>>>>> I'll do it today/tomorrow. I have additional cleanups to do. We will >>>>>>> have another RC soon, so I think by then we'll have ironed out everything. >>>>>>> >>>>>>> If you find anything else, please let me know. I'll go over it again and >>>>>>> again, hopefully cleaning it up properly. >>>>>>> >>>>>>> Would you like me to merge your text? >>>>>> I'd suggest that first, Ævar merges his branch as-is (any bikeshedding >>>>>> of it can be accommodated with further commits to blead rather than >>>>>> updating a separate branch). >>>>>> >>>>>> Then I'll merge in my @INC text, >>>>> Are we ready for the @INC text merge? >>>> That's already been done with 89853d76c827c07a8cd0cb38bd1727e96afaadef >>> >>> Thank you. >>> >>> How does that work with Perl #131304? >> >> I'm not sure what you mean. In that ticket, Kent attached my original >> suggested @INC text plus followup suggestions from other people in the >> original thread. Then Dominic tweaked it, and Ævar rebased and merged >> Dominic's text and closed the ticket. So I think that's all done. > > There was still the issue I noted in: > https://perl5.git.perl.org/perl.git/commitdiff/89853d76c827c07a8cd0cb38bd1727e96afaadef > > On reflection the best way to deal with this is probably to just > remove what I wrote about @INC and keep Dominic's text. I just pushed > a commit do to that: > https://perl5.git.perl.org/perl.git/commitdiff/2c4393cceb72ac358b1127131a605f20eb3e7588 > > If anyone disagrees just partially revert that & find some way to > integrate it into the "Removal of the current directory (C<.>) from > C<@INC>" section. > > The delta is still dirty under podchecker due to Karl's d8362e1b8aa: > > *** WARNING: node 'Unescaped left brace in regex is illegal here > in regex; marked by S<E<lt>-- HERE> in m/%s/' contains non-escaped | > or / at line 1526 in file pod/perldelta.pod > > I don't know enough about POD syntax to see how to fix that. Once > that's fixed the delta looks to be in good shape to me. > podcheck passed on my system before I pushed, and it still passes for me. Are you still getting this message?Thread Previous | Thread Next