For the 7.1 bugfix release we will cherry-pick the bug-fix commits from master into the stable-7 branch and release 7.1 from there at some point.
In this thread I will keep track of the commits which are in master but are not yet in stable-7.
List of commits in master but not in stable-7 (produced with pythin script)
See attachment cherry_pick_todecide.txt
It is also good to keep track of the commit which should not go into stable-7.
List of commits which should not be cherry-picked into stable-7
See attachment cherry_pick_donotlist.txt
The python script together with the list will give you the commits not in stable-7 but in master which are not in the list above of commits which should not go into stable-7. These are the commits which potentially go into stable-7.
In this thread I will keep track of the commits which are in master but are not yet in stable-7.
List of commits in master but not in stable-7 (produced with pythin script)
See attachment cherry_pick_todecide.txt
It is also good to keep track of the commit which should not go into stable-7.
List of commits which should not be cherry-picked into stable-7
See attachment cherry_pick_donotlist.txt
The python script together with the list will give you the commits not in stable-7 but in master which are not in the list above of commits which should not go into stable-7. These are the commits which potentially go into stable-7.
Attachment: cherry_pick_list.py.ext (711B)
Attachment: cherry_pick_todecide.txt (25k)
Attachment: cherry_pick_donotlist.txt (4k)
I have updated the lists, please be so kind to tell me which of your commits should be cherry-picked and which not (see the second list).
you can also cherry-pick your commits:
git checkout stable-7
git cherry-pick <hash>
Please don't squat the commits, otherwise it is hard to find them.
you can also cherry-pick your commits:
git checkout stable-7
git cherry-pick <hash>
Please don't squat the commits, otherwise it is hard to find them.
Not mine, but
need to go into stable because they fix build errors on NetBSD.
> + debc559bc7887a1633b62f93f83dde9fe8cdf7f7 CMake: Fix building mape on systems with more than one GTK+ CPP flag
> + b88339a84c71ac91953cedf35369390037ace648 Use sched_yield instead of pthread_yield in png save wait loop [cfkoch]
need to go into stable because they fix build errors on NetBSD.
> 5dfbff6b4d2d244e081b879f0e7151decc7041ea Elevator construction preview shows placement of the case (#1534).
Should go into stable
> 23:42 -occ:#openclonk-dev- isilkor * ad01c2e openclonk src/lib (StdMesh.cpp): Fix NULL deref when deserializing CustomNode AnimationNodes (GH #13)
should be stabled
Powered by mwForum 2.29.7 © 1999-2015 Markus Wichitill