vilemduha / blendercam

Automatically exported from code.google.com/p/blendercam
GNU General Public License v3.0
468 stars 119 forks source link

Edge branch #47

Closed ghost closed 8 years ago

ghost commented 8 years ago

I have set up an Edge branch (leading edge stuff) which will be for new features that will eventually be the next new release. Since its leading edge it can be unstable at times ie crashes and things not working like they should.

https://github.com/vilemnovak/blendercam/tree/edge

I see the master branch as being the stable branch of the most recent release. Commits to the master branch would be mainly bug fixes until the next release.

So what is in the edge branch right now? Here is a list of things that have been added since 0.9 release:

postprocessoptions

vilemduha commented 8 years ago

Thanks nfz, I will have to accomodate to this, since I always took releases as stable and what happened between was considered edge. As you know, there are many unfinished features in blenderCAM all the time...The problem might be with maintaining two branches, but if you can do it then I am fine with that ;)

vilemduha commented 8 years ago

Ok, I've been thinking about this... And I realized we allready have the Edge branch - it's the features which are marked EXPERIMENTAL. Could we keep it this way? The thing is, if you never give to people new underdeveloped features, you never get the feedback you need to finish that stuff :) So experimental stuff from one release can become non-experimental in the next release?

ghost commented 8 years ago

Yep, there are many ways of doing it. I went with the edge branch because I had a backlog of additions and didn't want to throw them in the master branch since they were only tested by me. I will look into how to set them up as EXPERIMENTAL.

vilemduha commented 8 years ago

setting them up as experimental is pretty straightforward, you make an if statement on the experimental property, and also write it in the description. Also, If you still want to keep such a branch, I don't want to stop you from that ;) It's just my preferred way of doing this. Feel free to commit any stuff to master anytime ;)

ghost commented 8 years ago

Looks straightforward. I will do some more testing before committing to master.