Re: Temporary branch for patches intended to go into Core Update 162

[Adolf Belka <adolf.belka@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2725 bytes --]

Hi Peter,

On 19/11/2021 14:54, Adolf Belka wrote:
> Hi Peter,
>
> On 19/11/2021 07:44, Peter Müller wrote:
>> Good morning Arne,
>> good morning folks,
>>
>> as discussed at the latest monthly conference 
>> (https://wiki.ipfire.org/devel/telco/2021-11-01) and
>> on the phone a few weeks ago, I just wanted to inform everyone about 
>> the current state of affairs
>> of handling patches:
>>
>> To shed some load from Arne, who is currently mastering Core Updates, 
>> we agreed on me opening up
>> a temporary branch (ad-hoc named "temp-cXXX-development", where XXX 
>> stands for the number of the
>> upcoming Core Update in question) in my Git repository for IPFire 
>> 2.x. There, I will apply patches
>> being ready to go into the distribution, so whoever is in charge of 
>> an update can eventually merge
>> this branch.
>>
>> I will subsequently eat through Patchwork, starting with the most 
>> recent patches. Additional commits
>> required (for example, for shipping rootfiles) will be made if possible.
>>
>> @Arne: Please find the branch for Core Update 162 here: 
>> https://git.ipfire.org/?p=people/pmueller/ipfire-2.x.git;a=shortlog;h=refs/heads/temp-c162-development
>> Let me know if there is anything wrong or dissatisfying, or some 
>> patches need to be reverted due
>> to an update becoming too big. Currently being on the go, it does not 
>> contain much yet, but you'll
>> get the idea.
>>
>> @All: Unfortunately, I lack permissions in Patchwork to mark other 
>> people's patches as being
>> superseded (@Michael: Can/should we change this?), should I become 
>> aware of them. As always, it
>> would be a great help if everyone would periodically review his/her 
>> Patchwork list, and scrub
>> orphaned/dropped/rejected/superseded patches from it.
>
> Have done a first pass through patchwork to clean up my patches. When 
> I get back from visiting my Sister I will go and finish everything off 
> so it is all up to date.
>
Have actually managed a further update trawl through patchwork while I 
am at my sisters.


One question I have. In the past patches changed from new to staged when 
they were merged into next. Now with the temp branch do we count it as 
staged in patchwork when the patch has been merged into that branch or 
should we wait until the temp branch is merged into next?

I have some patches that are now merged into the temp branch but not yet 
into next. Currently I am still leaving them as status New.

Regards,

Adolf.

> Regards,
>
> Adolf.
>
>> As always, please drop me a line in case of questions or comments.
>>
>> Thanks, and best regards,
>> Peter Müller
>
-- 
Sent from my laptop