Re: CVS commit: pkgsrc

[Greg Troxel <gdt%lexort.com@localhost>]

Thomas Klausner <wiz%gatalith.at@localhost> writes:

> On Sun, Jul 07, 2024 at 07:35:50AM -0400, Greg Troxel wrote:
>> Jonathan Perkin <jperkin%mnx.io@localhost> writes:
>> 
>> > * On 2024-07-07 at 08:18 BST, Adam wrote:
>> >
>> >>> I don't really understand why you've reverted all of the changes I made to clang in May and June?
>> >>>
>> >>> Specifically:
>> >>>
>> >>>  https://github.com/NetBSD/pkgsrc/commit/a2b2a216e080e74dc84e62d06cad70dea841b75d
>> >>>  https://github.com/NetBSD/pkgsrc/commit/d4a1200af7e7434859f5fad418e6d558abb1049a
>> >>>  https://github.com/NetBSD/pkgsrc/commit/7c9bbe171f0771f7c705725ca370d3ab0956dd83
>> >>
>> >>I copied from wip. Did you reflect your changes there?
>> >
>> > I wasn't aware we now have to maintain things in two places.  I must
>> > have missed this change to the guide.
>> >
>> > I'll just delete the SunOS work and maintain them in my fork instead
>> > then, I don't have time to do everything twice.
>> 
>> We do not have a documented requiremenet for fixes to pkgsrc to have to
>> look for and apply to a wip package that might later be used for an
>> update.
>> 
>> Adam: it is not ok to copy from wip without merging anything from pkgsrc
>> proper.   Please do the merge and ensure these changes are not lost.
>
> I've merged the changes as best as I could.
>
> I think two of the patches were merged upstream, perhaps the rest can
> be merged upstream too, that would be best for future updates to avoid
> problems like this, since not everyone can test on all platforms.

Certainly it would be good for jperkin to file the patches upstream; the
guide stays that is supposed to happen.  We should probably talk
explicitly about how to deal with patches that 1) people have not sent
upstream (but should have) and 2) have been sent but upstream is not
reasonable (which seems to happen to minority platforms.

I don't think this was really about "can't test" as "just copied wip to
main", or at least that's how I read the emails.