[Tracking] Backport commits to 0.20 branch

Here's the place for discussion related to coding in FreeCAD, C++ or Python. Design, interfaces and structures.
Forum rules
Be nice to others! Respect the FreeCAD code of conduct!
User avatar
wandererfan
Veteran
Posts: 6265
Joined: Tue Nov 06, 2012 5:42 pm
Contact:

Re: [Tracking] Backport commits to 0.20 branch

Post by wandererfan »

openBrain wrote: Thu Oct 06, 2022 2:07 pm Roughly you just have to checkout the (up-to-date) 0.20 branch, then 'git cherry-pick' the commits to be backported, and finally push the branch back.
I was overthinking this. Thanks for bringing me back to earth.
openBrain
Veteran
Posts: 9034
Joined: Fri Nov 09, 2018 5:38 pm
Contact:

Re: [Tracking] Backport commits to 0.20 branch

Post by openBrain »

wandererfan wrote: Fri Oct 07, 2022 2:53 pm I was overthinking this. Thanks for bringing me back to earth.
No problem. :) As said @adrianinaval, just be aware this is kind of things were merge conflicts can come pretty easily. :)
User avatar
Roy_043
Veteran
Posts: 8450
Joined: Thu Dec 27, 2018 12:28 pm

Re: [Tracking] Backport commits to 0.20 branch

Post by Roy_043 »

What is the correct procedure if you do not have sufficient permissions to push:
Fork 0.20 and do a PR?
User avatar
chennes
Veteran
Posts: 3876
Joined: Fri Dec 23, 2016 3:38 pm
Location: Norman, OK, USA
Contact:

Re: [Tracking] Backport commits to 0.20 branch

Post by chennes »

Yes - you ca submit a PR against any branch, it's in a dropdown menu on GitHub. I'd make sure to also state that you are doing so very clearly in the PR so there is no question of whether it was an accident, etc.
Chris Hennes
Pioneer Library System
GitHub profile, LinkedIn profile, chrishennes.com
User avatar
chennes
Veteran
Posts: 3876
Joined: Fri Dec 23, 2016 3:38 pm
Location: Norman, OK, USA
Contact:

Re: [Tracking] Backport commits to 0.20 branch

Post by chennes »

@openBrain's Spreadsheet: fix multi-screen management of QtColorPicker bugfix has been backported:
git commit cf6e561e5a9b7ddebdc465aa13eb247cf30ff46c
Chris Hennes
Pioneer Library System
GitHub profile, LinkedIn profile, chrishennes.com
User avatar
uwestoehr
Veteran
Posts: 4961
Joined: Sun Jan 27, 2019 3:21 am
Location: Germany
Contact:

Re: [Tracking] Backport commits to 0.20 branch

Post by uwestoehr »

chennes wrote: Fri Oct 21, 2022 2:33 pm @openBrain's Spreadsheet: fix multi-screen management of QtColorPicker bugfix has been backported:
git commit cf6e561e5a9b7ddebdc465aa13eb247cf30ff46c
Thanks!
When backporting please don't forget to add this to the list of the initial post since we use the list for the release notes.
User avatar
Roy_043
Veteran
Posts: 8450
Joined: Thu Dec 27, 2018 12:28 pm

Re: [Tracking] Backport commits to 0.20 branch

Post by Roy_043 »

The FreeCAD-0.20.2-WIN-x64-portable-2.zip file:
https://github.com/FreeCAD/FreeCAD/rele ... able-2.zip

Is not a ZIP but a copy of the EXE.

@uwestoehr Can you fix this please? Thanks.
User avatar
uwestoehr
Veteran
Posts: 4961
Joined: Sun Jan 27, 2019 3:21 am
Location: Germany
Contact:

Re: [Tracking] Backport commits to 0.20 branch

Post by uwestoehr »

Roy_043 wrote: Sun Jan 15, 2023 6:55 pm The FreeCAD-0.20.2-WIN-x64-portable-2.zip file:
https://github.com/FreeCAD/FreeCAD/rele ... able-2.zip

Is not a ZIP but a copy of the EXE.

@uwestoehr Can you fix this please? Thanks.
In what way should I fix this? You can just unpack the ZIP and get FreeCAD. I can try to make a special ZIP file but it will be larger in size. Therefore I saw no benefit.
GeneFC
Veteran
Posts: 5373
Joined: Sat Mar 19, 2016 3:36 pm
Location: Punta Gorda, FL

Re: [Tracking] Backport commits to 0.20 branch

Post by GeneFC »

Misnaming an exe file is very, very bad practice.

A common method for distribution of malware.

I have no interest whether it is a zip or an exe, but it must be named correctly.

Gene
Post Reply