search

Perl / perl5

🐪 The Perl programming language
https://dev.perl.org/perl5/
Other
1.9k stars 540 forks source link

File::Spec::{Unix,OS2}->path(): Keep trailing empty PATH elements #22403

Closed aarondill closed 1 month ago

aarondill commented 1 month ago

Fixes #22346 by ensuring that trailing PATH elements are maintained on Unix and OS2

aarondill commented 1 month ago

I've amended the commits to ensure all $VERSION values match (https://github.com/Perl/perl5/issues/22346#issuecomment-2227173799)

jkeenan commented 1 month ago

I've amended the commits to ensure all $VERSION values match (#22346 (comment))

This looks good to me, but I'd like to see https://github.com/Perl/perl5/pull/22404 merged in first.

jkeenan commented 1 month ago

I've amended the commits to ensure all $VERSION values match (#22346 (comment))

This looks good to me, but I'd like to see #22404 merged in first.

GH #22404 has been merged in to blead. That caused GitHub to append a hasConflicts label to this p.r. I attempted to resolve it via the web editor, only for GH now to tell me "This branch cannot be rebased due to conflicts."

I think I'll let the GH CI testing proceed before taking further action. In the meantime, if there is anyone else who wants to look over this pull request, please do so. Thanks.

jkeenan commented 1 month ago

I've amended the commits to ensure all $VERSION values match (#22346 (comment))

This looks good to me, but I'd like to see #22404 merged in first.

GH #22404 has been merged in to blead. That caused GitHub to append a hasConflicts label to this p.r. I attempted to resolve it via the web editor, only for GH now to tell me "This branch cannot be rebased due to conflicts."

I think I'll let the GH CI testing proceed before taking further action. In the meantime, if there is anyone else who wants to look over this pull request, please do so. Thanks.

@tonycoz or @book, can either of you look at the code changes being requested here and approve? At that point, I'll deal with the merge problems. Thanks.

aarondill commented 1 month ago

I'll rebase onto bleed and force push. that should be the simplest way to resolve the conflicts.

aarondill commented 1 month ago

@jkeenan I've rebased onto bleed and resolved the conflicts. This should keep the commit history and diff cleaner :smile:

jkeenan commented 1 month ago

@jkeenan I've rebased onto bleed and resolved the conflicts. This should keep the commit history and diff cleaner 😄

Thanks for that legwork. I've approved this commit and self-assigned. I'll allow for 2 or 3 days for other committers to approve, and then proceed to merge unless there's an objection.