Front page | perl.perl5.porters |
Postings from February 2023
TLDR: I merged a patch today that likely will cause conflicts for PRs that touch embed.fnc. I am happy to take on the burden of resolving these conflicts, and for many of our contributors I will do so without being asked. However if you need help, or would like me to do your PR first, or whatnot, please let me know and I will do my best to get it sorted ASAP. My apologies for the temporary inconvenience, I truly believe that in the long run it will reduce issues related to embed.fnc. DETAIL: In an earlier PR I applied various changes that meant that embed.fnc would now be autotidied as part of make regen, and I made it so we test that it is properly formatted before checking it in. This prevents surprises, and removes ambiguity. This was *meant* to also sort the contents of the file, but in a last minute attempt to make regen/HeaderParser.pm a bit more self-documenting I accidentally broke the sorting and did not notice. The patch was also meant to introduce normalized ordering for the flags used in each definition, but that patch was also somehow was dropped from the original sequence during branch cleanup. Today I merged a commit that rectifies these omissions and restores the original intended unambiguous representation. It also adds some additional validation and other minor tweaks. However it also means that any patches that touched embed.fnc are now virtually certain to be conflicted. Please do not hesitate to reach out to me by email, on #irc, or in github comments to request my help in resolving the conflicts to embed.fnc this may have caused. I have done it many times over and am totally happy to use my experience with this to help untangle any fallout from this merge. For those of you who I am already confident wont object to me doing so unilaterally I will pick up your pending PR's and get them unconflicted over the next few days. If you think I am overlooking your PR please dont hesitate to ask for my support. For those of you who would prefer to do it yourself please consider the following steps: git rebase origin/blead # conflicts git co HEAD embed.fnc # get the most recent version of the file git am --show-current-patch # review the embed.fnc changes vim embed.fnc # manually apply changes from above. # repeat the above steps until everything is good make regen # make sure everything is up to date git add -u #update all the changed files. git diff --cached # review changes git rebase --continue My apologies for any inconvenience. In future these kind of conflicts should essentially stop happening as there will be a single canonical place in the file for any given definition. Again to repeat, I am happy to perform this conflict resolution to any PR people would like, and I will do my best to do it without needing to be asked for most contributors and PR's that are already pushed to github. For the rest of you please just reach out if you are going nuts over this. cheers, Yves -- perl -Mre=debug -e "/just|another|perl|hacker/"Thread Next