[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
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 »

wandererfan wrote: Sun Sep 11, 2022 4:27 pm Wrong spelling of leader line preference: http://github.com/FreeCAD/FreeCAD/commit/e28317f772
Thanks. backported now
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 »

Done now.
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 »

uwestoehr wrote: Sun Sep 11, 2022 7:29 pm
marioalexis wrote: Thu Aug 18, 2022 1:34 pm The fix is embedded with other changes, so it might not be accepted. In that case, I can split the request and solve the specific regression.
Thanks. Yes, can you please make a separate PR directly for the 0-20 branch?
https://github.com/FreeCAD/FreeCAD/pull/7507 contains the backport and was now merged.
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 »

encode Xml special characters in spreadsheet - git commit a85f751668
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 »

wandererfan wrote: Tue Oct 04, 2022 12:20 pm encode Xml special characters in spreadsheet - git commit a85f751668
Thanks. I think i once asked if you can do the backport directly. In my opinion every developer should directly backport what he thinks is worth it. (This would also help me a bit, my spare time is very limited at the moment due to unforeseen issues and I currently only do some header work to relax before going to sleep (don't laugh ;) )).
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 »

uwestoehr wrote: Wed Oct 05, 2022 6:52 pm
wandererfan wrote: Tue Oct 04, 2022 12:20 pm encode Xml special characters in spreadsheet - git commit a85f751668
Thanks. I think I once asked if you can do the backport directly. In my opinion every developer should directly backport what he thinks is worth it.
I backported now.
User avatar
jnxd
Posts: 951
Joined: Mon Mar 30, 2015 2:30 pm
Contact:

Re: [Tracking] Backport commits to 0.20 branch

Post by jnxd »

uwestoehr wrote: Wed Oct 05, 2022 6:52 pm In my opinion every developer should directly backport what [they think] is worth it.
I don't think that's a good idea, unless you're referring to certain "core" developers with ability to merge. Otherwise people can try to merge everything.

Maybe commit suggestions can come with PRs onto the 0.20 (or previous supported version) branch with the tag "[Backport]".
My latest (or last) project: B-spline Construction Project.
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 »

uwestoehr wrote: Wed Oct 05, 2022 6:52 pm I think i once asked if you can do the backport directly. In my opinion every developer should directly backport what he thinks is worth it.
Are there instructions somewhere on how to do this? I know how to push the "rebase and merge" button for master branch, but that is the extent of my expertise on Github.
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: Thu Oct 06, 2022 1:28 pm Are there instructions somewhere on how to do this? I know how to push the "rebase and merge" button for master branch, but that is the extent of my expertise on Github.
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.
User avatar
adrianinsaval
Veteran
Posts: 5541
Joined: Thu Apr 05, 2018 5:15 pm

Re: [Tracking] Backport commits to 0.20 branch

Post by adrianinsaval »

Note that if there were other developments in the affected files in master branch it might not be enough to just cherry pick commits but also to adapt the solution to the 0.20 codebase or also backport the previous changes, this shouldn't be a common occurrence though
Post Reply