[fpc-devel] Preparing 3.2.4, call for merge request and regressions

[LacaK]

Dňa 27.9.2021 o 14:03 Michael Van Canneyt napísal(a):
> 
> 
> On Mon, 27 Sep 2021, LacaK via fpc-devel wrote:
> 
>>
>>>>>
>>>>>> Hello,
>>>>>> commit ab86ce7e62db2add637961e3ff98a7703c86cb2c
>>>>>> Author: lacak <lacak at idefix.freepascal.org>
>>>>>> Date:   Mon Jul 12 12:17:03 2021 +0000
>>>>>>
>>>>>> Sorry for so long list, but I absolutely do not understand how to 
>>>>>> do "cherry-pick" ... trying do it - I see there (in step 4: Pick 
>>>>>> into branch) only main branch and not fixes branch. So I do not 
>>>>>> know how to do it ...
>>>>>
>>>>> In the "pick into branch' dropdown, remove the 'main' from the 
>>>>> search box and start typing "fixes". The fixes branch will then 
>>>>> appear.
>>>>>
>>>>
>>>> Yes ;-) this works ... but after I click button "Cherry-pick", I get 
>>>> page not found (I am redirecting to some URL which does not exists:
>>>>
>> https://gitlab.com/lacak.sk/free-pascal-fpc-source/-/merge_requests/new?merge_request%5Bsource_branch%5D=cherry-pick-15dfa2e0&merge_request%5Bsource_project_id%5D=29308295&merge_request%5Btarget_branch%5D=fixes_3_2&merge_request%5Btarget_project_id%5D=28644964) 
>>
>>>>
>>>
>>> You must do this operation in the FPC source repository, not in your 
>>> fork.
>> Yes I do it in 
>> https://gitlab.com/freepascal.org/fpc/source/-/commit/a8cd770b3cdfcad4a383ac1cca651c315269cc35 
>>
>>
>> And I get then redirect to: 
>> https://gitlab.com/lacak.sk/free-pascal-fpc-source/-/merge_requests/new?merge_request%5Bsource_branch%5D=cherry-pick-a8cd770b&merge_request%5Bsource_project_id%5D=29308295&merge_request%5Btarget_branch%5D=fixes_3_2&merge_request%5Btarget_project_id%5D=28644964 
>>
> 
> That's strange because it should again go to the free pascal project. 
> What target project did you choose ?

Pick into project = freepascal.org/fpc/source
Pick into branch = fixes_3_2

L.