Re: [fpc-devel] Preparing 3.2.4, call for merge request and regressions
Thank you! Will there be also https://wiki.freepascal.org/FPC_New_Features_3.2.4 ? (I would like add there note) L. Am 27.09.2021 um 08:47 schrieb LacaK via fpc-devel : Hello, Sorry for so long list, No problem, a list is probably much easier to use than the web interface. I cherry picked all mentioned commits into fixes. ___ fpc-devel maillist - fpc-devel@lists.freepascal.org https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel ___ fpc-devel maillist - fpc-devel@lists.freepascal.org https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] Preparing 3.2.4, call for merge request and regressions
> Am 27.09.2021 um 08:47 schrieb LacaK via fpc-devel > : > > Hello, > > > Sorry for so long list, No problem, a list is probably much easier to use than the web interface. I cherry picked all mentioned commits into fixes. ___ fpc-devel maillist - fpc-devel@lists.freepascal.org https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] Preparing 3.2.4, call for merge request and regressions
Dňa 27.9.2021 o 14:13 Michael Van Canneyt napísal(a): On Mon, 27 Sep 2021, LacaK via fpc-devel wrote: 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 Looking at the URL, I doubt this, see my other mail. But maybe indeed some redirect happened after your initial choice, this I cannot see of course. Step by step: 1. I am here in commit: https://gitlab.com/freepascal.org/fpc/source/-/commit/b5a1c93ec282cedd9aa14c384e913c73ab9c087c 2. Click on Options/Cherry-pick 3. Select Pick into project = freepascal.org/fpc/source and Pick into branch = fixes_3_2 4. Click Cherry-pick button 5. I get another error message: "Sorry, we cannot cherry-pick this commit automatically. This commit may already have been cherry-picked, or a more recent commit may have updated some of its content." Let it be ... L. ___ fpc-devel maillist - fpc-devel@lists.freepascal.org https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] Preparing 3.2.4, call for merge request and regressions
On Mon, 27 Sep 2021, LacaK via fpc-devel wrote: 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 Looking at the URL, I doubt this, see my other mail. But maybe indeed some redirect happened after your initial choice, this I cannot see of course. Michael. ___ fpc-devel maillist - fpc-devel@lists.freepascal.org https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] Preparing 3.2.4, call for merge request and regressions
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 Date: Mon Jul 12 12:17:03 2021 + 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. ___ fpc-devel maillist - fpc-devel@lists.freepascal.org https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] Preparing 3.2.4, call for merge request and regressions
On Mon, 27 Sep 2021, LacaK via fpc-devel wrote: Hello, commit ab86ce7e62db2add637961e3ff98a7703c86cb2c Author: lacak Date: Mon Jul 12 12:17:03 2021 + 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 Just noticed: If you look at the source and target project IDs you see they are different, that explains why you get these strange results. Make sure the target project is freepascal.org/fpc/source Michael.___ fpc-devel maillist - fpc-devel@lists.freepascal.org https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] Preparing 3.2.4, call for merge request and regressions
On Mon, 27 Sep 2021, LacaK via fpc-devel wrote: Hello, commit ab86ce7e62db2add637961e3ff98a7703c86cb2c Author: lacak Date: Mon Jul 12 12:17:03 2021 + 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 ? Normally that should be the project: freepascal.org/fpc/source I did this operation for the commit you indicated, the following is the result: https://gitlab.com/freepascal.org/fpc/source/-/merge_requests/57 Michael.___ fpc-devel maillist - fpc-devel@lists.freepascal.org https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] Preparing 3.2.4, call for merge request and regressions
Hello, commit ab86ce7e62db2add637961e3ff98a7703c86cb2c Author: lacak Date: Mon Jul 12 12:17:03 2021 + 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 With "404 Page Not Found " When I return back to commit I see there message: "The commit has been successfully cherry-picked into cherry-pick-a8cd770b. You can now submit a merge request to get this change into the original project." L. ___ fpc-devel maillist - fpc-devel@lists.freepascal.org https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] Preparing 3.2.4, call for merge request and regressions
On Mon, 27 Sep 2021, LacaK via fpc-devel wrote: Dňa 27.9.2021 o 9:13 Michael Van Canneyt napísal(a): On Mon, 27 Sep 2021, LacaK via fpc-devel wrote: Hello, commit ab86ce7e62db2add637961e3ff98a7703c86cb2c Author: lacak Date: Mon Jul 12 12:17:03 2021 + 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. Michael.___ fpc-devel maillist - fpc-devel@lists.freepascal.org https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] Preparing 3.2.4, call for merge request and regressions
Dňa 27.9.2021 o 9:13 Michael Van Canneyt napísal(a): On Mon, 27 Sep 2021, LacaK via fpc-devel wrote: Hello, commit ab86ce7e62db2add637961e3ff98a7703c86cb2c Author: lacak Date: Mon Jul 12 12:17:03 2021 + 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) May be that in my Fork branch "fixes_3_2" does not exists? L. ___ fpc-devel maillist - fpc-devel@lists.freepascal.org https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] Preparing 3.2.4, call for merge request and regressions
On Mon, 27 Sep 2021, LacaK via fpc-devel wrote: Hello, commit ab86ce7e62db2add637961e3ff98a7703c86cb2c Author: lacak Date: Mon Jul 12 12:17:03 2021 + 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. Please try and report if this works for you. Maybe we need to improve the instructions. Michael.___ fpc-devel maillist - fpc-devel@lists.freepascal.org https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
