clean up branches - Githubissues

ofTheo / ofxKinect

legacy openFrameworks wrapper for the xbox kinect (OF pre-0.8.0+ only) - ofxKinect is now included and is being maintained in OF releases

MIT License

540 stars 105 forks source link

clean up branches #67

Closed danomatika closed 13 years ago

danomatika commented 13 years ago

As Kyle suggested, we should clean up the branch layout to follow OF core. I'd suggest the following steps:

merge develop with master
tag master as 0062
merge experimental with master (with some fixes for the 007 release)
tag master as 007
branch a new develop

Afterwards, the readme should be updated and all other features & bugfixes should be in separate branches.

kylemcdonald commented 13 years ago

yes, let's do it

danomatika commented 13 years ago

I'd say that the example projects should also be updated for 007, before tagging as 007 .. as well as removing the original 0062 example and removing the "beta" tag from the 007 projects.

If anyone needs 0062 support, they can get the tagged version ... or does it make sense to keep adding new project files. The beta project was a quick fix for 007 development, but it's definitely more of a kludge once we add versions.

danomatika commented 13 years ago

Any objections to me doing this soon?

kylemcdonald commented 13 years ago

be bold

danomatika commented 13 years ago

Sigh. Why does develop have a bunch of 007 specific commits ... ? Oh well, I'll have to blow some of them out.

danomatika commented 13 years ago

Oh, I see develop was merged with experimental. That shouldn't have happened as develop was supposed to support 0062 until it gets tagged. Experimental was to be the branch with 007 specific stuff that breaks 0062 ... I guess I have to merge earlier.

danomatika commented 13 years ago

I'm trying to merge an earlier version of develop with win support into master so I can tag it as 0062, but it dosen't seem to work yet. Still trying ...

danomatika commented 13 years ago

Ok, it's all done. Since there was some mucking around after OF 007 came out, it was easier to just merge develop and experimental with master. I then tagged a latest working state for 0062. Afterwards I updated ofxKinect and all project files for OF 007. I've tested on Win, Mac, and Linux. It seems to be working, so I tagged for 007 and created a develop branch.

Please make sure you re-clone and use a workflow like the OF core. Hopefully we can avoid the mess in the Network graph from now on!

Also, you guys owe me a beer next time you're in Pittsburgh.